| @@ -1,90 +1,92 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2016 Jean-Philippe Lang |
|
|
3 | 3 | # |
|
|
4 | 4 | # This program is free software; you can redistribute it and/or |
|
|
5 | 5 | # modify it under the terms of the GNU General Public License |
|
|
6 | 6 | # as published by the Free Software Foundation; either version 2 |
|
|
7 | 7 | # of the License, or (at your option) any later version. |
|
|
8 | 8 | # |
|
|
9 | 9 | # This program is distributed in the hope that it will be useful, |
|
|
10 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
11 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
12 | 12 | # GNU General Public License for more details. |
|
|
13 | 13 | # |
|
|
14 | 14 | # You should have received a copy of the GNU General Public License |
|
|
15 | 15 | # along with this program; if not, write to the Free Software |
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | class IssueRelationsController < ApplicationController |
|
|
19 | helper :issues | |
|
|
20 | ||
|
|
19 | 21 | before_action :find_issue, :authorize, :only => [:index, :create] |
|
|
20 | 22 | before_action :find_relation, :only => [:show, :destroy] |
|
|
21 | 23 | |
|
|
22 | 24 | accept_api_auth :index, :show, :create, :destroy |
|
|
23 | 25 | |
|
|
24 | 26 | def index |
|
|
25 | 27 | @relations = @issue.relations |
|
|
26 | 28 | |
|
|
27 | 29 | respond_to do |format| |
|
|
28 | 30 | format.html { head 200 } |
|
|
29 | 31 | format.api |
|
|
30 | 32 | end |
|
|
31 | 33 | end |
|
|
32 | 34 | |
|
|
33 | 35 | def show |
|
|
34 | 36 | raise Unauthorized unless @relation.visible? |
|
|
35 | 37 | |
|
|
36 | 38 | respond_to do |format| |
|
|
37 | 39 | format.html { head 200 } |
|
|
38 | 40 | format.api |
|
|
39 | 41 | end |
|
|
40 | 42 | end |
|
|
41 | 43 | |
|
|
42 | 44 | def create |
|
|
43 | 45 | @relation = IssueRelation.new |
|
|
44 | 46 | @relation.issue_from = @issue |
|
|
45 | 47 | @relation.safe_attributes = params[:relation] |
|
|
46 | 48 | @relation.init_journals(User.current) |
|
|
47 | 49 | saved = @relation.save |
|
|
48 | 50 | |
|
|
49 | 51 | respond_to do |format| |
|
|
50 | 52 | format.html { redirect_to issue_path(@issue) } |
|
|
51 | 53 | format.js { |
|
|
52 | 54 | @relations = @issue.reload.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } |
|
|
53 | 55 | } |
|
|
54 | 56 | format.api { |
|
|
55 | 57 | if saved |
|
|
56 | 58 | render :action => 'show', :status => :created, :location => relation_url(@relation) |
|
|
57 | 59 | else |
|
|
58 | 60 | render_validation_errors(@relation) |
|
|
59 | 61 | end |
|
|
60 | 62 | } |
|
|
61 | 63 | end |
|
|
62 | 64 | end |
|
|
63 | 65 | |
|
|
64 | 66 | def destroy |
|
|
65 | 67 | raise Unauthorized unless @relation.deletable? |
|
|
66 | 68 | @relation.init_journals(User.current) |
|
|
67 | 69 | @relation.destroy |
|
|
68 | 70 | |
|
|
69 | 71 | respond_to do |format| |
|
|
70 | 72 | format.html { redirect_to issue_path(@relation.issue_from) } |
|
|
71 | 73 | format.js |
|
|
72 | 74 | format.api { render_api_ok } |
|
|
73 | 75 | end |
|
|
74 | 76 | end |
|
|
75 | 77 | |
|
|
76 | 78 | private |
|
|
77 | 79 | |
|
|
78 | 80 | def find_issue |
|
|
79 | 81 | @issue = Issue.find(params[:issue_id]) |
|
|
80 | 82 | @project = @issue.project |
|
|
81 | 83 | rescue ActiveRecord::RecordNotFound |
|
|
82 | 84 | render_404 |
|
|
83 | 85 | end |
|
|
84 | 86 | |
|
|
85 | 87 | def find_relation |
|
|
86 | 88 | @relation = IssueRelation.find(params[:id]) |
|
|
87 | 89 | rescue ActiveRecord::RecordNotFound |
|
|
88 | 90 | render_404 |
|
|
89 | 91 | end |
|
|
90 | 92 | end |
| @@ -1,484 +1,515 | |||
|
|
1 | 1 | # encoding: utf-8 |
|
|
2 | 2 | # |
|
|
3 | 3 | # Redmine - project management software |
|
|
4 | 4 | # Copyright (C) 2006-2016 Jean-Philippe Lang |
|
|
5 | 5 | # |
|
|
6 | 6 | # This program is free software; you can redistribute it and/or |
|
|
7 | 7 | # modify it under the terms of the GNU General Public License |
|
|
8 | 8 | # as published by the Free Software Foundation; either version 2 |
|
|
9 | 9 | # of the License, or (at your option) any later version. |
|
|
10 | 10 | # |
|
|
11 | 11 | # This program is distributed in the hope that it will be useful, |
|
|
12 | 12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
13 | 13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
14 | 14 | # GNU General Public License for more details. |
|
|
15 | 15 | # |
|
|
16 | 16 | # You should have received a copy of the GNU General Public License |
|
|
17 | 17 | # along with this program; if not, write to the Free Software |
|
|
18 | 18 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
19 | 19 | |
|
|
20 | 20 | module IssuesHelper |
|
|
21 | 21 | include ApplicationHelper |
|
|
22 | 22 | include Redmine::Export::PDF::IssuesPdfHelper |
|
|
23 | 23 | |
|
|
24 | 24 | def issue_list(issues, &block) |
|
|
25 | 25 | ancestors = [] |
|
|
26 | 26 | issues.each do |issue| |
|
|
27 | 27 | while (ancestors.any? && !issue.is_descendant_of?(ancestors.last)) |
|
|
28 | 28 | ancestors.pop |
|
|
29 | 29 | end |
|
|
30 | 30 | yield issue, ancestors.size |
|
|
31 | 31 | ancestors << issue unless issue.leaf? |
|
|
32 | 32 | end |
|
|
33 | 33 | end |
|
|
34 | 34 | |
|
|
35 | 35 | def grouped_issue_list(issues, query, issue_count_by_group, &block) |
|
|
36 | 36 | ancestors = [] |
|
|
37 | 37 | grouped_query_results(issues, query, issue_count_by_group) do |issue, group_name, group_count, group_totals| |
|
|
38 | 38 | while (ancestors.any? && !issue.is_descendant_of?(ancestors.last)) |
|
|
39 | 39 | ancestors.pop |
|
|
40 | 40 | end |
|
|
41 | 41 | yield issue, ancestors.size, group_name, group_count, group_totals |
|
|
42 | 42 | ancestors << issue unless issue.leaf? |
|
|
43 | 43 | end |
|
|
44 | 44 | end |
|
|
45 | 45 | |
|
|
46 | 46 | # Renders a HTML/CSS tooltip |
|
|
47 | 47 | # |
|
|
48 | 48 | # To use, a trigger div is needed. This is a div with the class of "tooltip" |
|
|
49 | 49 | # that contains this method wrapped in a span with the class of "tip" |
|
|
50 | 50 | # |
|
|
51 | 51 | # <div class="tooltip"><%= link_to_issue(issue) %> |
|
|
52 | 52 | # <span class="tip"><%= render_issue_tooltip(issue) %></span> |
|
|
53 | 53 | # </div> |
|
|
54 | 54 | # |
|
|
55 | 55 | def render_issue_tooltip(issue) |
|
|
56 | 56 | @cached_label_status ||= l(:field_status) |
|
|
57 | 57 | @cached_label_start_date ||= l(:field_start_date) |
|
|
58 | 58 | @cached_label_due_date ||= l(:field_due_date) |
|
|
59 | 59 | @cached_label_assigned_to ||= l(:field_assigned_to) |
|
|
60 | 60 | @cached_label_priority ||= l(:field_priority) |
|
|
61 | 61 | @cached_label_project ||= l(:field_project) |
|
|
62 | 62 | |
|
|
63 | 63 | link_to_issue(issue) + "<br /><br />".html_safe + |
|
|
64 | 64 | "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe + |
|
|
65 | 65 | "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe + |
|
|
66 | 66 | "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe + |
|
|
67 | 67 | "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe + |
|
|
68 | 68 | "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe + |
|
|
69 | 69 | "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe |
|
|
70 | 70 | end |
|
|
71 | 71 | |
|
|
72 | 72 | def issue_heading(issue) |
|
|
73 | 73 | h("#{issue.tracker} ##{issue.id}") |
|
|
74 | 74 | end |
|
|
75 | 75 | |
|
|
76 | 76 | def render_issue_subject_with_tree(issue) |
|
|
77 | 77 | s = '' |
|
|
78 | 78 | ancestors = issue.root? ? [] : issue.ancestors.visible.to_a |
|
|
79 | 79 | ancestors.each do |ancestor| |
|
|
80 | 80 | s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id))) |
|
|
81 | 81 | end |
|
|
82 | 82 | s << '<div>' |
|
|
83 | 83 | subject = h(issue.subject) |
|
|
84 | 84 | if issue.is_private? |
|
|
85 | 85 | subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject |
|
|
86 | 86 | end |
|
|
87 | 87 | s << content_tag('h3', subject) |
|
|
88 | 88 | s << '</div>' * (ancestors.size + 1) |
|
|
89 | 89 | s.html_safe |
|
|
90 | 90 | end |
|
|
91 | 91 | |
|
|
92 | 92 | def render_descendants_tree(issue) |
|
|
93 | 93 | s = '<table class="list issues">' |
|
|
94 | 94 | issue_list(issue.descendants.visible.preload(:status, :priority, :tracker, :assigned_to).sort_by(&:lft)) do |child, level| |
|
|
95 | 95 | css = "issue issue-#{child.id} hascontextmenu #{child.css_classes}" |
|
|
96 | 96 | css << " idnt idnt-#{level}" if level > 0 |
|
|
97 | 97 | s << content_tag('tr', |
|
|
98 | 98 | content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') + |
|
|
99 | 99 | content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') + |
|
|
100 | 100 | content_tag('td', h(child.status), :class => 'status') + |
|
|
101 | 101 | content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') + |
|
|
102 | 102 | content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio'), |
|
|
103 | 103 | :class => css) |
|
|
104 | 104 | end |
|
|
105 | 105 | s << '</table>' |
|
|
106 | 106 | s.html_safe |
|
|
107 | 107 | end |
|
|
108 | 108 | |
|
|
109 | # Renders the list of related issues on the issue details view | |
|
|
110 | def render_issue_relations(issue, relations) | |
|
|
111 | manage_relations = User.current.allowed_to?(:manage_issue_relations, issue.project) | |
|
|
112 | ||
|
|
113 | s = ''.html_safe | |
|
|
114 | relations.each do |relation| | |
|
|
115 | other_issue = relation.other_issue(issue) | |
|
|
116 | css = "issue hascontextmenu #{other_issue.css_classes}" | |
|
|
117 | link = manage_relations ? link_to(l(:label_relation_delete), | |
|
|
118 | relation_path(relation), | |
|
|
119 | :remote => true, | |
|
|
120 | :method => :delete, | |
|
|
121 | :data => {:confirm => l(:text_are_you_sure)}, | |
|
|
122 | :title => l(:label_relation_delete), | |
|
|
123 | :class => 'icon-only icon-link-break' | |
|
|
124 | ) : nil | |
|
|
125 | ||
|
|
126 | s << content_tag('tr', | |
|
|
127 | content_tag('td', check_box_tag("ids[]", other_issue.id, false, :id => nil), :class => 'checkbox') + | |
|
|
128 | content_tag('td', relation.to_s(@issue) {|other| link_to_issue(other, :project => Setting.cross_project_issue_relations?)}.html_safe, :class => 'subject', :style => 'width: 50%') + | |
|
|
129 | content_tag('td', other_issue.status, :class => 'status') + | |
|
|
130 | content_tag('td', other_issue.start_date, :class => 'start_date') + | |
|
|
131 | content_tag('td', other_issue.due_date, :class => 'due_date') + | |
|
|
132 | content_tag('td', link, :class => 'buttons'), | |
|
|
133 | :id => "relation-#{relation.id}", | |
|
|
134 | :class => css) | |
|
|
135 | end | |
|
|
136 | ||
|
|
137 | content_tag('table', s, :class => 'list issues') | |
|
|
138 | end | |
|
|
139 | ||
|
|
109 | 140 | def issue_estimated_hours_details(issue) |
|
|
110 | 141 | if issue.total_estimated_hours.present? |
|
|
111 | 142 | if issue.total_estimated_hours == issue.estimated_hours |
|
|
112 | 143 | l_hours_short(issue.estimated_hours) |
|
|
113 | 144 | else |
|
|
114 | 145 | s = issue.estimated_hours.present? ? l_hours_short(issue.estimated_hours) : "" |
|
|
115 | 146 | s << " (#{l(:label_total)}: #{l_hours_short(issue.total_estimated_hours)})" |
|
|
116 | 147 | s.html_safe |
|
|
117 | 148 | end |
|
|
118 | 149 | end |
|
|
119 | 150 | end |
|
|
120 | 151 | |
|
|
121 | 152 | def issue_spent_hours_details(issue) |
|
|
122 | 153 | if issue.total_spent_hours > 0 |
|
|
123 | 154 | path = project_time_entries_path(issue.project, :issue_id => "~#{issue.id}") |
|
|
124 | 155 | |
|
|
125 | 156 | if issue.total_spent_hours == issue.spent_hours |
|
|
126 | 157 | link_to(l_hours_short(issue.spent_hours), path) |
|
|
127 | 158 | else |
|
|
128 | 159 | s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : "" |
|
|
129 | 160 | s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), path})" |
|
|
130 | 161 | s.html_safe |
|
|
131 | 162 | end |
|
|
132 | 163 | end |
|
|
133 | 164 | end |
|
|
134 | 165 | |
|
|
135 | 166 | # Returns an array of error messages for bulk edited issues |
|
|
136 | 167 | def bulk_edit_error_messages(issues) |
|
|
137 | 168 | messages = {} |
|
|
138 | 169 | issues.each do |issue| |
|
|
139 | 170 | issue.errors.full_messages.each do |message| |
|
|
140 | 171 | messages[message] ||= [] |
|
|
141 | 172 | messages[message] << issue |
|
|
142 | 173 | end |
|
|
143 | 174 | end |
|
|
144 | 175 | messages.map { |message, issues| |
|
|
145 | 176 | "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ') |
|
|
146 | 177 | } |
|
|
147 | 178 | end |
|
|
148 | 179 | |
|
|
149 | 180 | # Returns a link for adding a new subtask to the given issue |
|
|
150 | 181 | def link_to_new_subtask(issue) |
|
|
151 | 182 | attrs = { |
|
|
152 | 183 | :parent_issue_id => issue |
|
|
153 | 184 | } |
|
|
154 | 185 | attrs[:tracker_id] = issue.tracker unless issue.tracker.disabled_core_fields.include?('parent_issue_id') |
|
|
155 | 186 | link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs)) |
|
|
156 | 187 | end |
|
|
157 | 188 | |
|
|
158 | 189 | def trackers_options_for_select(issue) |
|
|
159 | 190 | trackers = issue.allowed_target_trackers |
|
|
160 | 191 | if issue.new_record? && issue.parent_issue_id.present? |
|
|
161 | 192 | trackers = trackers.reject do |tracker| |
|
|
162 | 193 | issue.tracker_id != tracker.id && tracker.disabled_core_fields.include?('parent_issue_id') |
|
|
163 | 194 | end |
|
|
164 | 195 | end |
|
|
165 | 196 | trackers.collect {|t| [t.name, t.id]} |
|
|
166 | 197 | end |
|
|
167 | 198 | |
|
|
168 | 199 | class IssueFieldsRows |
|
|
169 | 200 | include ActionView::Helpers::TagHelper |
|
|
170 | 201 | |
|
|
171 | 202 | def initialize |
|
|
172 | 203 | @left = [] |
|
|
173 | 204 | @right = [] |
|
|
174 | 205 | end |
|
|
175 | 206 | |
|
|
176 | 207 | def left(*args) |
|
|
177 | 208 | args.any? ? @left << cells(*args) : @left |
|
|
178 | 209 | end |
|
|
179 | 210 | |
|
|
180 | 211 | def right(*args) |
|
|
181 | 212 | args.any? ? @right << cells(*args) : @right |
|
|
182 | 213 | end |
|
|
183 | 214 | |
|
|
184 | 215 | def size |
|
|
185 | 216 | @left.size > @right.size ? @left.size : @right.size |
|
|
186 | 217 | end |
|
|
187 | 218 | |
|
|
188 | 219 | def to_html |
|
|
189 | 220 | content = |
|
|
190 | 221 | content_tag('div', @left.reduce(&:+), :class => 'splitcontentleft') + |
|
|
191 | 222 | content_tag('div', @right.reduce(&:+), :class => 'splitcontentleft') |
|
|
192 | 223 | |
|
|
193 | 224 | content_tag('div', content, :class => 'splitcontent') |
|
|
194 | 225 | end |
|
|
195 | 226 | |
|
|
196 | 227 | def cells(label, text, options={}) |
|
|
197 | 228 | options[:class] = [options[:class] || "", 'attribute'].join(' ') |
|
|
198 | 229 | content_tag 'div', |
|
|
199 | 230 | content_tag('div', label + ":", :class => 'label') + content_tag('div', text, :class => 'value'), |
|
|
200 | 231 | options |
|
|
201 | 232 | end |
|
|
202 | 233 | end |
|
|
203 | 234 | |
|
|
204 | 235 | def issue_fields_rows |
|
|
205 | 236 | r = IssueFieldsRows.new |
|
|
206 | 237 | yield r |
|
|
207 | 238 | r.to_html |
|
|
208 | 239 | end |
|
|
209 | 240 | |
|
|
210 | 241 | def render_custom_fields_rows(issue) |
|
|
211 | 242 | values = issue.visible_custom_field_values |
|
|
212 | 243 | return if values.empty? |
|
|
213 | 244 | half = (values.size / 2.0).ceil |
|
|
214 | 245 | issue_fields_rows do |rows| |
|
|
215 | 246 | values.each_with_index do |value, i| |
|
|
216 | 247 | css = "cf_#{value.custom_field.id}" |
|
|
217 | 248 | m = (i < half ? :left : :right) |
|
|
218 | 249 | rows.send m, custom_field_name_tag(value.custom_field), show_value(value), :class => css |
|
|
219 | 250 | end |
|
|
220 | 251 | end |
|
|
221 | 252 | end |
|
|
222 | 253 | |
|
|
223 | 254 | # Returns the path for updating the issue form |
|
|
224 | 255 | # with project as the current project |
|
|
225 | 256 | def update_issue_form_path(project, issue) |
|
|
226 | 257 | options = {:format => 'js'} |
|
|
227 | 258 | if issue.new_record? |
|
|
228 | 259 | if project |
|
|
229 | 260 | new_project_issue_path(project, options) |
|
|
230 | 261 | else |
|
|
231 | 262 | new_issue_path(options) |
|
|
232 | 263 | end |
|
|
233 | 264 | else |
|
|
234 | 265 | edit_issue_path(issue, options) |
|
|
235 | 266 | end |
|
|
236 | 267 | end |
|
|
237 | 268 | |
|
|
238 | 269 | # Returns the number of descendants for an array of issues |
|
|
239 | 270 | def issues_descendant_count(issues) |
|
|
240 | 271 | ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq |
|
|
241 | 272 | ids -= issues.map(&:id) |
|
|
242 | 273 | ids.size |
|
|
243 | 274 | end |
|
|
244 | 275 | |
|
|
245 | 276 | def issues_destroy_confirmation_message(issues) |
|
|
246 | 277 | issues = [issues] unless issues.is_a?(Array) |
|
|
247 | 278 | message = l(:text_issues_destroy_confirmation) |
|
|
248 | 279 | |
|
|
249 | 280 | descendant_count = issues_descendant_count(issues) |
|
|
250 | 281 | if descendant_count > 0 |
|
|
251 | 282 | message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count) |
|
|
252 | 283 | end |
|
|
253 | 284 | message |
|
|
254 | 285 | end |
|
|
255 | 286 | |
|
|
256 | 287 | # Returns an array of users that are proposed as watchers |
|
|
257 | 288 | # on the new issue form |
|
|
258 | 289 | def users_for_new_issue_watchers(issue) |
|
|
259 | 290 | users = issue.watcher_users |
|
|
260 | 291 | if issue.project.users.count <= 20 |
|
|
261 | 292 | users = (users + issue.project.users.sort).uniq |
|
|
262 | 293 | end |
|
|
263 | 294 | users |
|
|
264 | 295 | end |
|
|
265 | 296 | |
|
|
266 | 297 | def email_issue_attributes(issue, user) |
|
|
267 | 298 | items = [] |
|
|
268 | 299 | %w(author status priority assigned_to category fixed_version).each do |attribute| |
|
|
269 | 300 | unless issue.disabled_core_fields.include?(attribute+"_id") |
|
|
270 | 301 | items << "#{l("field_#{attribute}")}: #{issue.send attribute}" |
|
|
271 | 302 | end |
|
|
272 | 303 | end |
|
|
273 | 304 | issue.visible_custom_field_values(user).each do |value| |
|
|
274 | 305 | items << "#{value.custom_field.name}: #{show_value(value, false)}" |
|
|
275 | 306 | end |
|
|
276 | 307 | items |
|
|
277 | 308 | end |
|
|
278 | 309 | |
|
|
279 | 310 | def render_email_issue_attributes(issue, user, html=false) |
|
|
280 | 311 | items = email_issue_attributes(issue, user) |
|
|
281 | 312 | if html |
|
|
282 | 313 | content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe) |
|
|
283 | 314 | else |
|
|
284 | 315 | items.map{|s| "* #{s}"}.join("\n") |
|
|
285 | 316 | end |
|
|
286 | 317 | end |
|
|
287 | 318 | |
|
|
288 | 319 | # Returns the textual representation of a journal details |
|
|
289 | 320 | # as an array of strings |
|
|
290 | 321 | def details_to_strings(details, no_html=false, options={}) |
|
|
291 | 322 | options[:only_path] = (options[:only_path] == false ? false : true) |
|
|
292 | 323 | strings = [] |
|
|
293 | 324 | values_by_field = {} |
|
|
294 | 325 | details.each do |detail| |
|
|
295 | 326 | if detail.property == 'cf' |
|
|
296 | 327 | field = detail.custom_field |
|
|
297 | 328 | if field && field.multiple? |
|
|
298 | 329 | values_by_field[field] ||= {:added => [], :deleted => []} |
|
|
299 | 330 | if detail.old_value |
|
|
300 | 331 | values_by_field[field][:deleted] << detail.old_value |
|
|
301 | 332 | end |
|
|
302 | 333 | if detail.value |
|
|
303 | 334 | values_by_field[field][:added] << detail.value |
|
|
304 | 335 | end |
|
|
305 | 336 | next |
|
|
306 | 337 | end |
|
|
307 | 338 | end |
|
|
308 | 339 | strings << show_detail(detail, no_html, options) |
|
|
309 | 340 | end |
|
|
310 | 341 | if values_by_field.present? |
|
|
311 | 342 | multiple_values_detail = Struct.new(:property, :prop_key, :custom_field, :old_value, :value) |
|
|
312 | 343 | values_by_field.each do |field, changes| |
|
|
313 | 344 | if changes[:added].any? |
|
|
314 | 345 | detail = multiple_values_detail.new('cf', field.id.to_s, field) |
|
|
315 | 346 | detail.value = changes[:added] |
|
|
316 | 347 | strings << show_detail(detail, no_html, options) |
|
|
317 | 348 | end |
|
|
318 | 349 | if changes[:deleted].any? |
|
|
319 | 350 | detail = multiple_values_detail.new('cf', field.id.to_s, field) |
|
|
320 | 351 | detail.old_value = changes[:deleted] |
|
|
321 | 352 | strings << show_detail(detail, no_html, options) |
|
|
322 | 353 | end |
|
|
323 | 354 | end |
|
|
324 | 355 | end |
|
|
325 | 356 | strings |
|
|
326 | 357 | end |
|
|
327 | 358 | |
|
|
328 | 359 | # Returns the textual representation of a single journal detail |
|
|
329 | 360 | def show_detail(detail, no_html=false, options={}) |
|
|
330 | 361 | multiple = false |
|
|
331 | 362 | show_diff = false |
|
|
332 | 363 | no_details = false |
|
|
333 | 364 | |
|
|
334 | 365 | case detail.property |
|
|
335 | 366 | when 'attr' |
|
|
336 | 367 | field = detail.prop_key.to_s.gsub(/\_id$/, "") |
|
|
337 | 368 | label = l(("field_" + field).to_sym) |
|
|
338 | 369 | case detail.prop_key |
|
|
339 | 370 | when 'due_date', 'start_date' |
|
|
340 | 371 | value = format_date(detail.value.to_date) if detail.value |
|
|
341 | 372 | old_value = format_date(detail.old_value.to_date) if detail.old_value |
|
|
342 | 373 | |
|
|
343 | 374 | when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id', |
|
|
344 | 375 | 'priority_id', 'category_id', 'fixed_version_id' |
|
|
345 | 376 | value = find_name_by_reflection(field, detail.value) |
|
|
346 | 377 | old_value = find_name_by_reflection(field, detail.old_value) |
|
|
347 | 378 | |
|
|
348 | 379 | when 'estimated_hours' |
|
|
349 | 380 | value = l_hours_short(detail.value.to_f) unless detail.value.blank? |
|
|
350 | 381 | old_value = l_hours_short(detail.old_value.to_f) unless detail.old_value.blank? |
|
|
351 | 382 | |
|
|
352 | 383 | when 'parent_id' |
|
|
353 | 384 | label = l(:field_parent_issue) |
|
|
354 | 385 | value = "##{detail.value}" unless detail.value.blank? |
|
|
355 | 386 | old_value = "##{detail.old_value}" unless detail.old_value.blank? |
|
|
356 | 387 | |
|
|
357 | 388 | when 'is_private' |
|
|
358 | 389 | value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank? |
|
|
359 | 390 | old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank? |
|
|
360 | 391 | |
|
|
361 | 392 | when 'description' |
|
|
362 | 393 | show_diff = true |
|
|
363 | 394 | end |
|
|
364 | 395 | when 'cf' |
|
|
365 | 396 | custom_field = detail.custom_field |
|
|
366 | 397 | if custom_field |
|
|
367 | 398 | label = custom_field.name |
|
|
368 | 399 | if custom_field.format.class.change_no_details |
|
|
369 | 400 | no_details = true |
|
|
370 | 401 | elsif custom_field.format.class.change_as_diff |
|
|
371 | 402 | show_diff = true |
|
|
372 | 403 | else |
|
|
373 | 404 | multiple = custom_field.multiple? |
|
|
374 | 405 | value = format_value(detail.value, custom_field) if detail.value |
|
|
375 | 406 | old_value = format_value(detail.old_value, custom_field) if detail.old_value |
|
|
376 | 407 | end |
|
|
377 | 408 | end |
|
|
378 | 409 | when 'attachment' |
|
|
379 | 410 | label = l(:label_attachment) |
|
|
380 | 411 | when 'relation' |
|
|
381 | 412 | if detail.value && !detail.old_value |
|
|
382 | 413 | rel_issue = Issue.visible.find_by_id(detail.value) |
|
|
383 | 414 | value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" : |
|
|
384 | 415 | (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path])) |
|
|
385 | 416 | elsif detail.old_value && !detail.value |
|
|
386 | 417 | rel_issue = Issue.visible.find_by_id(detail.old_value) |
|
|
387 | 418 | old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" : |
|
|
388 | 419 | (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path])) |
|
|
389 | 420 | end |
|
|
390 | 421 | relation_type = IssueRelation::TYPES[detail.prop_key] |
|
|
391 | 422 | label = l(relation_type[:name]) if relation_type |
|
|
392 | 423 | end |
|
|
393 | 424 | call_hook(:helper_issues_show_detail_after_setting, |
|
|
394 | 425 | {:detail => detail, :label => label, :value => value, :old_value => old_value }) |
|
|
395 | 426 | |
|
|
396 | 427 | label ||= detail.prop_key |
|
|
397 | 428 | value ||= detail.value |
|
|
398 | 429 | old_value ||= detail.old_value |
|
|
399 | 430 | |
|
|
400 | 431 | unless no_html |
|
|
401 | 432 | label = content_tag('strong', label) |
|
|
402 | 433 | old_value = content_tag("i", h(old_value)) if detail.old_value |
|
|
403 | 434 | if detail.old_value && detail.value.blank? && detail.property != 'relation' |
|
|
404 | 435 | old_value = content_tag("del", old_value) |
|
|
405 | 436 | end |
|
|
406 | 437 | if detail.property == 'attachment' && value.present? && |
|
|
407 | 438 | atta = detail.journal.journalized.attachments.detect {|a| a.id == detail.prop_key.to_i} |
|
|
408 | 439 | # Link to the attachment if it has not been removed |
|
|
409 | 440 | value = link_to_attachment(atta, :download => true, :only_path => options[:only_path]) |
|
|
410 | 441 | if options[:only_path] != false && (atta.is_text? || atta.is_image?) |
|
|
411 | 442 | value += ' ' |
|
|
412 | 443 | value += link_to(l(:button_view), |
|
|
413 | 444 | { :controller => 'attachments', :action => 'show', |
|
|
414 | 445 | :id => atta, :filename => atta.filename }, |
|
|
415 | 446 | :class => 'icon-only icon-magnifier', |
|
|
416 | 447 | :title => l(:button_view)) |
|
|
417 | 448 | end |
|
|
418 | 449 | else |
|
|
419 | 450 | value = content_tag("i", h(value)) if value |
|
|
420 | 451 | end |
|
|
421 | 452 | end |
|
|
422 | 453 | |
|
|
423 | 454 | if no_details |
|
|
424 | 455 | s = l(:text_journal_changed_no_detail, :label => label).html_safe |
|
|
425 | 456 | elsif show_diff |
|
|
426 | 457 | s = l(:text_journal_changed_no_detail, :label => label) |
|
|
427 | 458 | unless no_html |
|
|
428 | 459 | diff_link = link_to 'diff', |
|
|
429 | 460 | diff_journal_url(detail.journal_id, :detail_id => detail.id, :only_path => options[:only_path]), |
|
|
430 | 461 | :title => l(:label_view_diff) |
|
|
431 | 462 | s << " (#{ diff_link })" |
|
|
432 | 463 | end |
|
|
433 | 464 | s.html_safe |
|
|
434 | 465 | elsif detail.value.present? |
|
|
435 | 466 | case detail.property |
|
|
436 | 467 | when 'attr', 'cf' |
|
|
437 | 468 | if detail.old_value.present? |
|
|
438 | 469 | l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe |
|
|
439 | 470 | elsif multiple |
|
|
440 | 471 | l(:text_journal_added, :label => label, :value => value).html_safe |
|
|
441 | 472 | else |
|
|
442 | 473 | l(:text_journal_set_to, :label => label, :value => value).html_safe |
|
|
443 | 474 | end |
|
|
444 | 475 | when 'attachment', 'relation' |
|
|
445 | 476 | l(:text_journal_added, :label => label, :value => value).html_safe |
|
|
446 | 477 | end |
|
|
447 | 478 | else |
|
|
448 | 479 | l(:text_journal_deleted, :label => label, :old => old_value).html_safe |
|
|
449 | 480 | end |
|
|
450 | 481 | end |
|
|
451 | 482 | |
|
|
452 | 483 | # Find the name of an associated record stored in the field attribute |
|
|
453 | 484 | def find_name_by_reflection(field, id) |
|
|
454 | 485 | unless id.present? |
|
|
455 | 486 | return nil |
|
|
456 | 487 | end |
|
|
457 | 488 | @detail_value_name_by_reflection ||= Hash.new do |hash, key| |
|
|
458 | 489 | association = Issue.reflect_on_association(key.first.to_sym) |
|
|
459 | 490 | name = nil |
|
|
460 | 491 | if association |
|
|
461 | 492 | record = association.klass.find_by_id(key.last) |
|
|
462 | 493 | if record |
|
|
463 | 494 | name = record.name.force_encoding('UTF-8') |
|
|
464 | 495 | end |
|
|
465 | 496 | end |
|
|
466 | 497 | hash[key] = name |
|
|
467 | 498 | end |
|
|
468 | 499 | @detail_value_name_by_reflection[[field, id]] |
|
|
469 | 500 | end |
|
|
470 | 501 | |
|
|
471 | 502 | # Renders issue children recursively |
|
|
472 | 503 | def render_api_issue_children(issue, api) |
|
|
473 | 504 | return if issue.leaf? |
|
|
474 | 505 | api.array :children do |
|
|
475 | 506 | issue.children.each do |child| |
|
|
476 | 507 | api.issue(:id => child.id) do |
|
|
477 | 508 | api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil? |
|
|
478 | 509 | api.subject child.subject |
|
|
479 | 510 | render_api_issue_children(child, api) |
|
|
480 | 511 | end |
|
|
481 | 512 | end |
|
|
482 | 513 | end |
|
|
483 | 514 | end |
|
|
484 | 515 | end |
| @@ -1,43 +1,22 | |||
|
|
1 | 1 | <div class="contextual"> |
|
|
2 | 2 | <% if User.current.allowed_to?(:manage_issue_relations, @project) %> |
|
|
3 | 3 | <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %> |
|
|
4 | 4 | <% end %> |
|
|
5 | 5 | </div> |
|
|
6 | 6 | |
|
|
7 | 7 | <p><strong><%=l(:label_related_issues)%></strong></p> |
|
|
8 | 8 | |
|
|
9 | 9 | <% if @relations.present? %> |
|
|
10 | 10 | <%= form_tag({}, :data => {:cm_url => issues_context_menu_path}) do %> |
|
|
11 | <table class="list issues"> | |
|
|
12 | <% @relations.each do |relation| %> | |
|
|
13 | <% other_issue = relation.other_issue(@issue) -%> | |
|
|
14 | <tr class="issue hascontextmenu <%= other_issue.css_classes %>" id="relation-<%= relation.id %>"> | |
|
|
15 | <td class="checkbox"><%= check_box_tag("ids[]", other_issue.id, false, :id => nil) %></td> | |
|
|
16 | <td class="subject" style="width: 50%"> | |
|
|
17 | <%= relation.to_s(@issue) {|other| link_to_issue(other, :project => Setting.cross_project_issue_relations?)}.html_safe %> | |
|
|
18 | </td> | |
|
|
19 | <td class="status"><%= other_issue.status.name %></td> | |
|
|
20 | <td class="start_date"><%= format_date(other_issue.start_date) %></td> | |
|
|
21 | <td class="due_date"><%= format_date(other_issue.due_date) %></td> | |
|
|
22 | <td class="buttons"><%= link_to(l(:label_relation_delete), | |
|
|
23 | relation_path(relation), | |
|
|
24 | :remote => true, | |
|
|
25 | :method => :delete, | |
|
|
26 | :data => {:confirm => l(:text_are_you_sure)}, | |
|
|
27 | :title => l(:label_relation_delete), | |
|
|
28 | :class => 'icon-only icon-link-break' | |
|
|
29 | ) if User.current.allowed_to?(:manage_issue_relations, @project) %></td> | |
|
|
30 | </tr> | |
|
|
31 | <% end %> | |
|
|
32 | </table> | |
|
|
11 | <%= render_issue_relations(@issue, @relations) %> | |
|
|
33 | 12 | <% end %> |
|
|
34 | 13 | <% end %> |
|
|
35 | 14 | |
|
|
36 | 15 | <%= form_for @relation, { |
|
|
37 | 16 | :as => :relation, :remote => true, |
|
|
38 | 17 | :url => issue_relations_path(@issue), |
|
|
39 | 18 | :method => :post, |
|
|
40 | 19 | :html => {:id => 'new-relation-form', :style => 'display: none;'} |
|
|
41 | 20 | } do |f| %> |
|
|
42 | 21 | <%= render :partial => 'issue_relations/form', :locals => {:f => f}%> |
|
|
43 | 22 | <% end %> |
General Comments 0
You need to be logged in to leave comments.
Login now