| @@ -1,517 +1,517 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2015 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 IssuesController < ApplicationController |
|
|
19 | 19 | menu_item :new_issue, :only => [:new, :create] |
|
|
20 | 20 | default_search_scope :issues |
|
|
21 | 21 | |
|
|
22 | 22 | before_filter :find_issue, :only => [:show, :edit, :update] |
|
|
23 | 23 | before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy] |
|
|
24 | 24 | before_filter :authorize, :except => [:index, :new, :create] |
|
|
25 | 25 | before_filter :find_optional_project, :only => [:index, :new, :create] |
|
|
26 | 26 | before_filter :build_new_issue_from_params, :only => [:new, :create] |
|
|
27 | 27 | accept_rss_auth :index, :show |
|
|
28 | 28 | accept_api_auth :index, :show, :create, :update, :destroy |
|
|
29 | 29 | |
|
|
30 | 30 | rescue_from Query::StatementInvalid, :with => :query_statement_invalid |
|
|
31 | 31 | |
|
|
32 | 32 | helper :journals |
|
|
33 | 33 | helper :projects |
|
|
34 | 34 | helper :custom_fields |
|
|
35 | 35 | helper :issue_relations |
|
|
36 | 36 | helper :watchers |
|
|
37 | 37 | helper :attachments |
|
|
38 | 38 | helper :queries |
|
|
39 | 39 | include QueriesHelper |
|
|
40 | 40 | helper :repositories |
|
|
41 | 41 | helper :sort |
|
|
42 | 42 | include SortHelper |
|
|
43 | 43 | helper :timelog |
|
|
44 | 44 | |
|
|
45 | 45 | def index |
|
|
46 | 46 | retrieve_query |
|
|
47 | 47 | sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria) |
|
|
48 | 48 | sort_update(@query.sortable_columns) |
|
|
49 | 49 | @query.sort_criteria = sort_criteria.to_a |
|
|
50 | 50 | |
|
|
51 | 51 | if @query.valid? |
|
|
52 | 52 | case params[:format] |
|
|
53 | 53 | when 'csv', 'pdf' |
|
|
54 | 54 | @limit = Setting.issues_export_limit.to_i |
|
|
55 | 55 | if params[:columns] == 'all' |
|
|
56 | 56 | @query.column_names = @query.available_inline_columns.map(&:name) |
|
|
57 | 57 | end |
|
|
58 | 58 | when 'atom' |
|
|
59 | 59 | @limit = Setting.feeds_limit.to_i |
|
|
60 | 60 | when 'xml', 'json' |
|
|
61 | 61 | @offset, @limit = api_offset_and_limit |
|
|
62 | 62 | @query.column_names = %w(author) |
|
|
63 | 63 | else |
|
|
64 | 64 | @limit = per_page_option |
|
|
65 | 65 | end |
|
|
66 | 66 | |
|
|
67 | 67 | @issue_count = @query.issue_count |
|
|
68 | 68 | @issue_pages = Paginator.new @issue_count, @limit, params['page'] |
|
|
69 | 69 | @offset ||= @issue_pages.offset |
|
|
70 | 70 | @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version], |
|
|
71 | 71 | :order => sort_clause, |
|
|
72 | 72 | :offset => @offset, |
|
|
73 | 73 | :limit => @limit) |
|
|
74 | 74 | @issue_count_by_group = @query.issue_count_by_group |
|
|
75 | 75 | |
|
|
76 | 76 | respond_to do |format| |
|
|
77 | 77 | format.html { render :template => 'issues/index', :layout => !request.xhr? } |
|
|
78 | 78 | format.api { |
|
|
79 | 79 | Issue.load_visible_relations(@issues) if include_in_api_response?('relations') |
|
|
80 | 80 | } |
|
|
81 | 81 | format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") } |
|
|
82 | 82 | format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') } |
|
|
83 | 83 | format.pdf { send_file_headers! :type => 'application/pdf', :filename => 'issues.pdf' } |
|
|
84 | 84 | end |
|
|
85 | 85 | else |
|
|
86 | 86 | respond_to do |format| |
|
|
87 | 87 | format.html { render(:template => 'issues/index', :layout => !request.xhr?) } |
|
|
88 | 88 | format.any(:atom, :csv, :pdf) { render(:nothing => true) } |
|
|
89 | 89 | format.api { render_validation_errors(@query) } |
|
|
90 | 90 | end |
|
|
91 | 91 | end |
|
|
92 | 92 | rescue ActiveRecord::RecordNotFound |
|
|
93 | 93 | render_404 |
|
|
94 | 94 | end |
|
|
95 | 95 | |
|
|
96 | 96 | def show |
|
|
97 | 97 | @journals = @issue.journals.includes(:user, :details). |
|
|
98 | 98 | references(:user, :details). |
|
|
99 | 99 | reorder(:created_on, :id).to_a |
|
|
100 | 100 | @journals.each_with_index {|j,i| j.indice = i+1} |
|
|
101 | 101 | @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) |
|
|
102 | 102 | Journal.preload_journals_details_custom_fields(@journals) |
|
|
103 | 103 | @journals.select! {|journal| journal.notes? || journal.visible_details.any?} |
|
|
104 | 104 | @journals.reverse! if User.current.wants_comments_in_reverse_order? |
|
|
105 | 105 | |
|
|
106 | 106 | @changesets = @issue.changesets.visible.preload(:repository, :user).to_a |
|
|
107 | 107 | @changesets.reverse! if User.current.wants_comments_in_reverse_order? |
|
|
108 | 108 | |
|
|
109 | 109 | @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } |
|
|
110 | 110 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current) |
|
|
111 | 111 | @priorities = IssuePriority.active |
|
|
112 | 112 | @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) |
|
|
113 | 113 | @relation = IssueRelation.new |
|
|
114 | 114 | |
|
|
115 | 115 | respond_to do |format| |
|
|
116 | 116 | format.html { |
|
|
117 | 117 | retrieve_previous_and_next_issue_ids |
|
|
118 | 118 | render :template => 'issues/show' |
|
|
119 | 119 | } |
|
|
120 | 120 | format.api |
|
|
121 | 121 | format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' } |
|
|
122 | 122 | format.pdf { |
|
|
123 | 123 | send_file_headers! :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf" |
|
|
124 | 124 | } |
|
|
125 | 125 | end |
|
|
126 | 126 | end |
|
|
127 | 127 | |
|
|
128 | 128 | def new |
|
|
129 | 129 | respond_to do |format| |
|
|
130 | 130 | format.html { render :action => 'new', :layout => !request.xhr? } |
|
|
131 | 131 | format.js |
|
|
132 | 132 | end |
|
|
133 | 133 | end |
|
|
134 | 134 | |
|
|
135 | 135 | def create |
|
|
136 | 136 | unless User.current.allowed_to?(:add_issues, @issue.project, :global => true) |
|
|
137 | 137 | raise ::Unauthorized |
|
|
138 | 138 | end |
|
|
139 | 139 | call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue }) |
|
|
140 | 140 | @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads])) |
|
|
141 | 141 | if @issue.save |
|
|
142 | 142 | call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue}) |
|
|
143 | 143 | respond_to do |format| |
|
|
144 | 144 | format.html { |
|
|
145 | 145 | render_attachment_warning_if_needed(@issue) |
|
|
146 | 146 | flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject)) |
|
|
147 | 147 | redirect_after_create |
|
|
148 | 148 | } |
|
|
149 | 149 | format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) } |
|
|
150 | 150 | end |
|
|
151 | 151 | return |
|
|
152 | 152 | else |
|
|
153 | 153 | respond_to do |format| |
|
|
154 | 154 | format.html { |
|
|
155 | 155 | if @issue.project.nil? |
|
|
156 | 156 | render_error :status => 422 |
|
|
157 | 157 | else |
|
|
158 | 158 | render :action => 'new' |
|
|
159 | 159 | end |
|
|
160 | 160 | } |
|
|
161 | 161 | format.api { render_validation_errors(@issue) } |
|
|
162 | 162 | end |
|
|
163 | 163 | end |
|
|
164 | 164 | end |
|
|
165 | 165 | |
|
|
166 | 166 | def edit |
|
|
167 | 167 | return unless update_issue_from_params |
|
|
168 | 168 | |
|
|
169 | 169 | respond_to do |format| |
|
|
170 | 170 | format.html { } |
|
|
171 | 171 | format.js |
|
|
172 | 172 | end |
|
|
173 | 173 | end |
|
|
174 | 174 | |
|
|
175 | 175 | def update |
|
|
176 | 176 | return unless update_issue_from_params |
|
|
177 | 177 | @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads])) |
|
|
178 | 178 | saved = false |
|
|
179 | 179 | begin |
|
|
180 | 180 | saved = save_issue_with_child_records |
|
|
181 | 181 | rescue ActiveRecord::StaleObjectError |
|
|
182 | 182 | @conflict = true |
|
|
183 | 183 | if params[:last_journal_id] |
|
|
184 | 184 | @conflict_journals = @issue.journals_after(params[:last_journal_id]).to_a |
|
|
185 | 185 | @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project) |
|
|
186 | 186 | end |
|
|
187 | 187 | end |
|
|
188 | 188 | |
|
|
189 | 189 | if saved |
|
|
190 | 190 | render_attachment_warning_if_needed(@issue) |
|
|
191 | 191 | flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record? |
|
|
192 | 192 | |
|
|
193 | 193 | respond_to do |format| |
|
|
194 | 194 | format.html { redirect_back_or_default issue_path(@issue) } |
|
|
195 | 195 | format.api { render_api_ok } |
|
|
196 | 196 | end |
|
|
197 | 197 | else |
|
|
198 | 198 | respond_to do |format| |
|
|
199 | 199 | format.html { render :action => 'edit' } |
|
|
200 | 200 | format.api { render_validation_errors(@issue) } |
|
|
201 | 201 | end |
|
|
202 | 202 | end |
|
|
203 | 203 | end |
|
|
204 | 204 | |
|
|
205 | 205 | # Bulk edit/copy a set of issues |
|
|
206 | 206 | def bulk_edit |
|
|
207 | 207 | @issues.sort! |
|
|
208 | 208 | @copy = params[:copy].present? |
|
|
209 | 209 | @notes = params[:notes] |
|
|
210 | 210 | |
|
|
211 | 211 | if @copy |
|
|
212 | 212 | unless User.current.allowed_to?(:copy_issues, @projects) |
|
|
213 | 213 | raise ::Unauthorized |
|
|
214 | 214 | end |
|
|
215 | 215 | end |
|
|
216 | 216 | |
|
|
217 | 217 | @allowed_projects = Issue.allowed_target_projects |
|
|
218 | 218 | if params[:issue] |
|
|
219 | 219 | @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s} |
|
|
220 | 220 | if @target_project |
|
|
221 | 221 | target_projects = [@target_project] |
|
|
222 | 222 | end |
|
|
223 | 223 | end |
|
|
224 | 224 | target_projects ||= @projects |
|
|
225 | 225 | |
|
|
226 | 226 | if @copy |
|
|
227 | 227 | # Copied issues will get their default statuses |
|
|
228 | 228 | @available_statuses = [] |
|
|
229 | 229 | else |
|
|
230 | 230 | @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&) |
|
|
231 | 231 | end |
|
|
232 | 232 | @custom_fields = @issues.map{|i|i.editable_custom_fields}.reduce(:&) |
|
|
233 | 233 | @assignables = target_projects.map(&:assignable_users).reduce(:&) |
|
|
234 | 234 | @trackers = target_projects.map(&:trackers).reduce(:&) |
|
|
235 | 235 | @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&) |
|
|
236 | 236 | @categories = target_projects.map {|p| p.issue_categories}.reduce(:&) |
|
|
237 | 237 | if @copy |
|
|
238 | 238 | @attachments_present = @issues.detect {|i| i.attachments.any?}.present? |
|
|
239 | 239 | @subtasks_present = @issues.detect {|i| !i.leaf?}.present? |
|
|
240 | 240 | end |
|
|
241 | 241 | |
|
|
242 | 242 | @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&) |
|
|
243 | 243 | |
|
|
244 | 244 | @issue_params = params[:issue] || {} |
|
|
245 | 245 | @issue_params[:custom_field_values] ||= {} |
|
|
246 | 246 | end |
|
|
247 | 247 | |
|
|
248 | 248 | def bulk_update |
|
|
249 | 249 | @issues.sort! |
|
|
250 | 250 | @copy = params[:copy].present? |
|
|
251 | 251 | |
|
|
252 | 252 | attributes = parse_params_for_bulk_issue_attributes(params) |
|
|
253 | 253 | copy_subtasks = (params[:copy_subtasks] == '1') |
|
|
254 | 254 | copy_attachments = (params[:copy_attachments] == '1') |
|
|
255 | 255 | |
|
|
256 | 256 | if @copy |
|
|
257 | 257 | unless User.current.allowed_to?(:copy_issues, @projects) |
|
|
258 | 258 | raise ::Unauthorized |
|
|
259 | 259 | end |
|
|
260 | 260 | target_projects = @projects |
|
|
261 | 261 | if attributes['project_id'].present? |
|
|
262 | 262 | target_projects = Project.where(:id => attributes['project_id']).to_a |
|
|
263 | 263 | end |
|
|
264 | 264 | unless User.current.allowed_to?(:add_issues, target_projects) |
|
|
265 | 265 | raise ::Unauthorized |
|
|
266 | 266 | end |
|
|
267 | 267 | end |
|
|
268 | 268 | |
|
|
269 | 269 | unsaved_issues = [] |
|
|
270 | 270 | saved_issues = [] |
|
|
271 | 271 | |
|
|
272 | 272 | if @copy && copy_subtasks |
|
|
273 | 273 | # Descendant issues will be copied with the parent task |
|
|
274 | 274 | # Don't copy them twice |
|
|
275 | 275 | @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}} |
|
|
276 | 276 | end |
|
|
277 | 277 | |
|
|
278 | 278 | @issues.each do |orig_issue| |
|
|
279 | 279 | orig_issue.reload |
|
|
280 | 280 | if @copy |
|
|
281 | 281 | issue = orig_issue.copy({}, |
|
|
282 | 282 | :attachments => copy_attachments, |
|
|
283 | 283 | :subtasks => copy_subtasks, |
|
|
284 | 284 | :link => link_copy?(params[:link_copy]) |
|
|
285 | 285 | ) |
|
|
286 | 286 | else |
|
|
287 | 287 | issue = orig_issue |
|
|
288 | 288 | end |
|
|
289 | 289 | journal = issue.init_journal(User.current, params[:notes]) |
|
|
290 | 290 | issue.safe_attributes = attributes |
|
|
291 | 291 | call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue }) |
|
|
292 | 292 | if issue.save |
|
|
293 | 293 | saved_issues << issue |
|
|
294 | 294 | else |
|
|
295 | 295 | unsaved_issues << orig_issue |
|
|
296 | 296 | end |
|
|
297 | 297 | end |
|
|
298 | 298 | |
|
|
299 | 299 | if unsaved_issues.empty? |
|
|
300 | 300 | flash[:notice] = l(:notice_successful_update) unless saved_issues.empty? |
|
|
301 | 301 | if params[:follow] |
|
|
302 | 302 | if @issues.size == 1 && saved_issues.size == 1 |
|
|
303 | 303 | redirect_to issue_path(saved_issues.first) |
|
|
304 | 304 | elsif saved_issues.map(&:project).uniq.size == 1 |
|
|
305 | 305 | redirect_to project_issues_path(saved_issues.map(&:project).first) |
|
|
306 | 306 | end |
|
|
307 | 307 | else |
|
|
308 | 308 | redirect_back_or_default _project_issues_path(@project) |
|
|
309 | 309 | end |
|
|
310 | 310 | else |
|
|
311 | 311 | @saved_issues = @issues |
|
|
312 | 312 | @unsaved_issues = unsaved_issues |
|
|
313 | 313 | @issues = Issue.visible.where(:id => @unsaved_issues.map(&:id)).to_a |
|
|
314 | 314 | bulk_edit |
|
|
315 | 315 | render :action => 'bulk_edit' |
|
|
316 | 316 | end |
|
|
317 | 317 | end |
|
|
318 | 318 | |
|
|
319 | 319 | def destroy |
|
|
320 | 320 | @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f |
|
|
321 | 321 | if @hours > 0 |
|
|
322 | 322 | case params[:todo] |
|
|
323 | 323 | when 'destroy' |
|
|
324 | 324 | # nothing to do |
|
|
325 | 325 | when 'nullify' |
|
|
326 | 326 | TimeEntry.where(['issue_id IN (?)', @issues]).update_all('issue_id = NULL') |
|
|
327 | 327 | when 'reassign' |
|
|
328 | 328 | reassign_to = @project.issues.find_by_id(params[:reassign_to_id]) |
|
|
329 | 329 | if reassign_to.nil? |
|
|
330 | 330 | flash.now[:error] = l(:error_issue_not_found_in_project) |
|
|
331 | 331 | return |
|
|
332 | 332 | else |
|
|
333 | 333 | TimeEntry.where(['issue_id IN (?)', @issues]). |
|
|
334 | 334 | update_all("issue_id = #{reassign_to.id}") |
|
|
335 | 335 | end |
|
|
336 | 336 | else |
|
|
337 | 337 | # display the destroy form if it's a user request |
|
|
338 | 338 | return unless api_request? |
|
|
339 | 339 | end |
|
|
340 | 340 | end |
|
|
341 | 341 | @issues.each do |issue| |
|
|
342 | 342 | begin |
|
|
343 | 343 | issue.reload.destroy |
|
|
344 | 344 | rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists |
|
|
345 | 345 | # nothing to do, issue was already deleted (eg. by a parent) |
|
|
346 | 346 | end |
|
|
347 | 347 | end |
|
|
348 | 348 | respond_to do |format| |
|
|
349 | 349 | format.html { redirect_back_or_default _project_issues_path(@project) } |
|
|
350 | 350 | format.api { render_api_ok } |
|
|
351 | 351 | end |
|
|
352 | 352 | end |
|
|
353 | 353 | |
|
|
354 | 354 | private |
|
|
355 | 355 | |
|
|
356 | 356 | def retrieve_previous_and_next_issue_ids |
|
|
357 | 357 | retrieve_query_from_session |
|
|
358 | 358 | if @query |
|
|
359 | 359 | sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria) |
|
|
360 | 360 | sort_update(@query.sortable_columns, 'issues_index_sort') |
|
|
361 | 361 | limit = 500 |
|
|
362 | 362 | issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version]) |
|
|
363 | 363 | if (idx = issue_ids.index(@issue.id)) && idx < limit |
|
|
364 | 364 | if issue_ids.size < 500 |
|
|
365 | 365 | @issue_position = idx + 1 |
|
|
366 | 366 | @issue_count = issue_ids.size |
|
|
367 | 367 | end |
|
|
368 | 368 | @prev_issue_id = issue_ids[idx - 1] if idx > 0 |
|
|
369 | 369 | @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1) |
|
|
370 | 370 | end |
|
|
371 | 371 | end |
|
|
372 | 372 | end |
|
|
373 | 373 | |
|
|
374 | 374 | # Used by #edit and #update to set some common instance variables |
|
|
375 | 375 | # from the params |
|
|
376 | 376 | def update_issue_from_params |
|
|
377 | 377 | @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project) |
|
|
378 | 378 | if params[:time_entry] |
|
|
379 | 379 | @time_entry.attributes = params[:time_entry] |
|
|
380 | 380 | end |
|
|
381 | 381 | |
|
|
382 | 382 | @issue.init_journal(User.current) |
|
|
383 | 383 | |
|
|
384 | 384 | issue_attributes = params[:issue] |
|
|
385 | 385 | if issue_attributes && params[:conflict_resolution] |
|
|
386 | 386 | case params[:conflict_resolution] |
|
|
387 | 387 | when 'overwrite' |
|
|
388 | 388 | issue_attributes = issue_attributes.dup |
|
|
389 | 389 | issue_attributes.delete(:lock_version) |
|
|
390 | 390 | when 'add_notes' |
|
|
391 | issue_attributes = issue_attributes.slice(:notes) | |
|
|
391 | issue_attributes = issue_attributes.slice(:notes, :private_notes) | |
|
|
392 | 392 | when 'cancel' |
|
|
393 | 393 | redirect_to issue_path(@issue) |
|
|
394 | 394 | return false |
|
|
395 | 395 | end |
|
|
396 | 396 | end |
|
|
397 | 397 | @issue.safe_attributes = issue_attributes |
|
|
398 | 398 | @priorities = IssuePriority.active |
|
|
399 | 399 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current) |
|
|
400 | 400 | true |
|
|
401 | 401 | end |
|
|
402 | 402 | |
|
|
403 | 403 | # Used by #new and #create to build a new issue from the params |
|
|
404 | 404 | # The new issue will be copied from an existing one if copy_from parameter is given |
|
|
405 | 405 | def build_new_issue_from_params |
|
|
406 | 406 | @issue = Issue.new |
|
|
407 | 407 | if params[:copy_from] |
|
|
408 | 408 | begin |
|
|
409 | 409 | @issue.init_journal(User.current) |
|
|
410 | 410 | @copy_from = Issue.visible.find(params[:copy_from]) |
|
|
411 | 411 | unless User.current.allowed_to?(:copy_issues, @copy_from.project) |
|
|
412 | 412 | raise ::Unauthorized |
|
|
413 | 413 | end |
|
|
414 | 414 | @link_copy = link_copy?(params[:link_copy]) || request.get? |
|
|
415 | 415 | @copy_attachments = params[:copy_attachments].present? || request.get? |
|
|
416 | 416 | @copy_subtasks = params[:copy_subtasks].present? || request.get? |
|
|
417 | 417 | @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks, :link => @link_copy) |
|
|
418 | 418 | rescue ActiveRecord::RecordNotFound |
|
|
419 | 419 | render_404 |
|
|
420 | 420 | return |
|
|
421 | 421 | end |
|
|
422 | 422 | end |
|
|
423 | 423 | @issue.project = @project |
|
|
424 | 424 | if request.get? |
|
|
425 | 425 | @issue.project ||= @issue.allowed_target_projects.first |
|
|
426 | 426 | end |
|
|
427 | 427 | @issue.author ||= User.current |
|
|
428 | 428 | @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date? |
|
|
429 | 429 | |
|
|
430 | 430 | if attrs = params[:issue].deep_dup |
|
|
431 | 431 | if action_name == 'new' && params[:was_default_status] == attrs[:status_id] |
|
|
432 | 432 | attrs.delete(:status_id) |
|
|
433 | 433 | end |
|
|
434 | 434 | @issue.safe_attributes = attrs |
|
|
435 | 435 | end |
|
|
436 | 436 | if @issue.project |
|
|
437 | 437 | @issue.tracker ||= @issue.project.trackers.first |
|
|
438 | 438 | if @issue.tracker.nil? |
|
|
439 | 439 | render_error l(:error_no_tracker_in_project) |
|
|
440 | 440 | return false |
|
|
441 | 441 | end |
|
|
442 | 442 | if @issue.status.nil? |
|
|
443 | 443 | render_error l(:error_no_default_issue_status) |
|
|
444 | 444 | return false |
|
|
445 | 445 | end |
|
|
446 | 446 | end |
|
|
447 | 447 | |
|
|
448 | 448 | @priorities = IssuePriority.active |
|
|
449 | 449 | @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?) |
|
|
450 | 450 | end |
|
|
451 | 451 | |
|
|
452 | 452 | def parse_params_for_bulk_issue_attributes(params) |
|
|
453 | 453 | attributes = (params[:issue] || {}).reject {|k,v| v.blank?} |
|
|
454 | 454 | attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'} |
|
|
455 | 455 | if custom = attributes[:custom_field_values] |
|
|
456 | 456 | custom.reject! {|k,v| v.blank?} |
|
|
457 | 457 | custom.keys.each do |k| |
|
|
458 | 458 | if custom[k].is_a?(Array) |
|
|
459 | 459 | custom[k] << '' if custom[k].delete('__none__') |
|
|
460 | 460 | else |
|
|
461 | 461 | custom[k] = '' if custom[k] == '__none__' |
|
|
462 | 462 | end |
|
|
463 | 463 | end |
|
|
464 | 464 | end |
|
|
465 | 465 | attributes |
|
|
466 | 466 | end |
|
|
467 | 467 | |
|
|
468 | 468 | # Saves @issue and a time_entry from the parameters |
|
|
469 | 469 | def save_issue_with_child_records |
|
|
470 | 470 | Issue.transaction do |
|
|
471 | 471 | if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project) |
|
|
472 | 472 | time_entry = @time_entry || TimeEntry.new |
|
|
473 | 473 | time_entry.project = @issue.project |
|
|
474 | 474 | time_entry.issue = @issue |
|
|
475 | 475 | time_entry.user = User.current |
|
|
476 | 476 | time_entry.spent_on = User.current.today |
|
|
477 | 477 | time_entry.attributes = params[:time_entry] |
|
|
478 | 478 | @issue.time_entries << time_entry |
|
|
479 | 479 | end |
|
|
480 | 480 | |
|
|
481 | 481 | call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal}) |
|
|
482 | 482 | if @issue.save |
|
|
483 | 483 | call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal}) |
|
|
484 | 484 | else |
|
|
485 | 485 | raise ActiveRecord::Rollback |
|
|
486 | 486 | end |
|
|
487 | 487 | end |
|
|
488 | 488 | end |
|
|
489 | 489 | |
|
|
490 | 490 | # Returns true if the issue copy should be linked |
|
|
491 | 491 | # to the original issue |
|
|
492 | 492 | def link_copy?(param) |
|
|
493 | 493 | case Setting.link_copied_issue |
|
|
494 | 494 | when 'yes' |
|
|
495 | 495 | true |
|
|
496 | 496 | when 'no' |
|
|
497 | 497 | false |
|
|
498 | 498 | when 'ask' |
|
|
499 | 499 | param == '1' |
|
|
500 | 500 | end |
|
|
501 | 501 | end |
|
|
502 | 502 | |
|
|
503 | 503 | # Redirects user after a successful issue creation |
|
|
504 | 504 | def redirect_after_create |
|
|
505 | 505 | if params[:continue] |
|
|
506 | 506 | attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} |
|
|
507 | 507 | if params[:project_id] |
|
|
508 | 508 | redirect_to new_project_issue_path(@issue.project, :issue => attrs) |
|
|
509 | 509 | else |
|
|
510 | 510 | attrs.merge! :project_id => @issue.project_id |
|
|
511 | 511 | redirect_to new_issue_path(:issue => attrs) |
|
|
512 | 512 | end |
|
|
513 | 513 | else |
|
|
514 | 514 | redirect_to issue_path(@issue) |
|
|
515 | 515 | end |
|
|
516 | 516 | end |
|
|
517 | 517 | end |
| @@ -1,261 +1,282 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2015 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 | require File.expand_path('../../test_helper', __FILE__) |
|
|
19 | 19 | require 'issues_controller' |
|
|
20 | 20 | |
|
|
21 | 21 | class IssuesControllerTransactionTest < ActionController::TestCase |
|
|
22 | 22 | tests IssuesController |
|
|
23 | 23 | fixtures :projects, |
|
|
24 | 24 | :users, |
|
|
25 | 25 | :roles, |
|
|
26 | 26 | :members, |
|
|
27 | 27 | :member_roles, |
|
|
28 | 28 | :issues, |
|
|
29 | 29 | :issue_statuses, |
|
|
30 | 30 | :versions, |
|
|
31 | 31 | :trackers, |
|
|
32 | 32 | :projects_trackers, |
|
|
33 | 33 | :issue_categories, |
|
|
34 | 34 | :enabled_modules, |
|
|
35 | 35 | :enumerations, |
|
|
36 | 36 | :attachments, |
|
|
37 | 37 | :workflows, |
|
|
38 | 38 | :custom_fields, |
|
|
39 | 39 | :custom_values, |
|
|
40 | 40 | :custom_fields_projects, |
|
|
41 | 41 | :custom_fields_trackers, |
|
|
42 | 42 | :time_entries, |
|
|
43 | 43 | :journals, |
|
|
44 | 44 | :journal_details, |
|
|
45 | 45 | :queries |
|
|
46 | 46 | |
|
|
47 | 47 | self.use_transactional_fixtures = false |
|
|
48 | 48 | |
|
|
49 | 49 | def setup |
|
|
50 | 50 | User.current = nil |
|
|
51 | 51 | end |
|
|
52 | 52 | |
|
|
53 | 53 | def test_update_stale_issue_should_not_update_the_issue |
|
|
54 | 54 | issue = Issue.find(2) |
|
|
55 | 55 | @request.session[:user_id] = 2 |
|
|
56 | 56 | |
|
|
57 | 57 | assert_no_difference 'Journal.count' do |
|
|
58 | 58 | assert_no_difference 'TimeEntry.count' do |
|
|
59 | 59 | put :update, |
|
|
60 | 60 | :id => issue.id, |
|
|
61 | 61 | :issue => { |
|
|
62 | 62 | :fixed_version_id => 4, |
|
|
63 | 63 | :notes => 'My notes', |
|
|
64 | 64 | :lock_version => (issue.lock_version - 1) |
|
|
65 | 65 | }, |
|
|
66 | 66 | :time_entry => { :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id } |
|
|
67 | 67 | end |
|
|
68 | 68 | end |
|
|
69 | 69 | |
|
|
70 | 70 | assert_response :success |
|
|
71 | 71 | assert_template 'edit' |
|
|
72 | 72 | |
|
|
73 | 73 | assert_select 'div.conflict' |
|
|
74 | 74 | assert_select 'input[name=?][value=?]', 'conflict_resolution', 'overwrite' |
|
|
75 | 75 | assert_select 'input[name=?][value=?]', 'conflict_resolution', 'add_notes' |
|
|
76 | 76 | assert_select 'label' do |
|
|
77 | 77 | assert_select 'input[name=?][value=?]', 'conflict_resolution', 'cancel' |
|
|
78 | 78 | assert_select 'a[href="/issues/2"]' |
|
|
79 | 79 | end |
|
|
80 | 80 | end |
|
|
81 | 81 | |
|
|
82 | 82 | def test_update_stale_issue_should_save_attachments |
|
|
83 | 83 | set_tmp_attachments_directory |
|
|
84 | 84 | issue = Issue.find(2) |
|
|
85 | 85 | @request.session[:user_id] = 2 |
|
|
86 | 86 | |
|
|
87 | 87 | assert_no_difference 'Journal.count' do |
|
|
88 | 88 | assert_no_difference 'TimeEntry.count' do |
|
|
89 | 89 | assert_difference 'Attachment.count' do |
|
|
90 | 90 | put :update, |
|
|
91 | 91 | :id => issue.id, |
|
|
92 | 92 | :issue => { |
|
|
93 | 93 | :fixed_version_id => 4, |
|
|
94 | 94 | :notes => 'My notes', |
|
|
95 | 95 | :lock_version => (issue.lock_version - 1) |
|
|
96 | 96 | }, |
|
|
97 | 97 | :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}, |
|
|
98 | 98 | :time_entry => { :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id } |
|
|
99 | 99 | end |
|
|
100 | 100 | end |
|
|
101 | 101 | end |
|
|
102 | 102 | |
|
|
103 | 103 | assert_response :success |
|
|
104 | 104 | assert_template 'edit' |
|
|
105 | 105 | attachment = Attachment.order('id DESC').first |
|
|
106 | 106 | assert_select 'input[name=?][value=?]', 'attachments[p0][token]', attachment.token |
|
|
107 | 107 | assert_select 'input[name=?][value=?]', 'attachments[p0][filename]', 'testfile.txt' |
|
|
108 | 108 | end |
|
|
109 | 109 | |
|
|
110 | 110 | def test_update_stale_issue_without_notes_should_not_show_add_notes_option |
|
|
111 | 111 | issue = Issue.find(2) |
|
|
112 | 112 | @request.session[:user_id] = 2 |
|
|
113 | 113 | |
|
|
114 | 114 | put :update, :id => issue.id, |
|
|
115 | 115 | :issue => { |
|
|
116 | 116 | :fixed_version_id => 4, |
|
|
117 | 117 | :notes => '', |
|
|
118 | 118 | :lock_version => (issue.lock_version - 1) |
|
|
119 | 119 | } |
|
|
120 | 120 | |
|
|
121 | 121 | assert_select 'div.conflict' |
|
|
122 | 122 | assert_select 'input[name=conflict_resolution][value=overwrite]' |
|
|
123 | 123 | assert_select 'input[name=conflict_resolution][value=add_notes]', 0 |
|
|
124 | 124 | assert_select 'input[name=conflict_resolution][value=cancel]' |
|
|
125 | 125 | end |
|
|
126 | 126 | |
|
|
127 | 127 | def test_update_stale_issue_should_show_conflicting_journals |
|
|
128 | 128 | @request.session[:user_id] = 2 |
|
|
129 | 129 | |
|
|
130 | 130 | put :update, :id => 1, |
|
|
131 | 131 | :issue => { |
|
|
132 | 132 | :fixed_version_id => 4, |
|
|
133 | 133 | :notes => '', |
|
|
134 | 134 | :lock_version => 2 |
|
|
135 | 135 | }, |
|
|
136 | 136 | :last_journal_id => 1 |
|
|
137 | 137 | |
|
|
138 | 138 | assert_not_nil assigns(:conflict_journals) |
|
|
139 | 139 | assert_equal 1, assigns(:conflict_journals).size |
|
|
140 | 140 | assert_equal 2, assigns(:conflict_journals).first.id |
|
|
141 | 141 | |
|
|
142 | 142 | assert_select 'div.conflict', :text => /Some notes with Redmine links/ |
|
|
143 | 143 | end |
|
|
144 | 144 | |
|
|
145 | 145 | def test_update_stale_issue_without_previous_journal_should_show_all_journals |
|
|
146 | 146 | @request.session[:user_id] = 2 |
|
|
147 | 147 | |
|
|
148 | 148 | put :update, :id => 1, |
|
|
149 | 149 | :issue => { |
|
|
150 | 150 | :fixed_version_id => 4, |
|
|
151 | 151 | :notes => '', |
|
|
152 | 152 | :lock_version => 2 |
|
|
153 | 153 | }, |
|
|
154 | 154 | :last_journal_id => '' |
|
|
155 | 155 | |
|
|
156 | 156 | assert_not_nil assigns(:conflict_journals) |
|
|
157 | 157 | assert_equal 2, assigns(:conflict_journals).size |
|
|
158 | 158 | assert_select 'div.conflict', :text => /Some notes with Redmine links/ |
|
|
159 | 159 | assert_select 'div.conflict', :text => /Journal notes/ |
|
|
160 | 160 | end |
|
|
161 | 161 | |
|
|
162 | 162 | def test_update_stale_issue_should_show_private_journals_with_permission_only |
|
|
163 | 163 | journal = Journal.create!(:journalized => Issue.find(1), :notes => 'Privates notes', :private_notes => true, :user_id => 1) |
|
|
164 | 164 | |
|
|
165 | 165 | @request.session[:user_id] = 2 |
|
|
166 | 166 | put :update, :id => 1, :issue => {:fixed_version_id => 4, :lock_version => 2}, :last_journal_id => '' |
|
|
167 | 167 | assert_include journal, assigns(:conflict_journals) |
|
|
168 | 168 | |
|
|
169 | 169 | Role.find(1).remove_permission! :view_private_notes |
|
|
170 | 170 | put :update, :id => 1, :issue => {:fixed_version_id => 4, :lock_version => 2}, :last_journal_id => '' |
|
|
171 | 171 | assert_not_include journal, assigns(:conflict_journals) |
|
|
172 | 172 | end |
|
|
173 | 173 | |
|
|
174 | 174 | def test_update_stale_issue_with_overwrite_conflict_resolution_should_update |
|
|
175 | 175 | @request.session[:user_id] = 2 |
|
|
176 | 176 | |
|
|
177 | 177 | assert_difference 'Journal.count' do |
|
|
178 | 178 | put :update, :id => 1, |
|
|
179 | 179 | :issue => { |
|
|
180 | 180 | :fixed_version_id => 4, |
|
|
181 | 181 | :notes => 'overwrite_conflict_resolution', |
|
|
182 | 182 | :lock_version => 2 |
|
|
183 | 183 | }, |
|
|
184 | 184 | :conflict_resolution => 'overwrite' |
|
|
185 | 185 | end |
|
|
186 | 186 | |
|
|
187 | 187 | assert_response 302 |
|
|
188 | 188 | issue = Issue.find(1) |
|
|
189 | 189 | assert_equal 4, issue.fixed_version_id |
|
|
190 | 190 | journal = Journal.order('id DESC').first |
|
|
191 | 191 | assert_equal 'overwrite_conflict_resolution', journal.notes |
|
|
192 | 192 | assert journal.details.any? |
|
|
193 | 193 | end |
|
|
194 | 194 | |
|
|
195 | 195 | def test_update_stale_issue_with_add_notes_conflict_resolution_should_update |
|
|
196 | 196 | @request.session[:user_id] = 2 |
|
|
197 | 197 | |
|
|
198 | 198 | assert_difference 'Journal.count' do |
|
|
199 | 199 | put :update, :id => 1, |
|
|
200 | 200 | :issue => { |
|
|
201 | 201 | :fixed_version_id => 4, |
|
|
202 | 202 | :notes => 'add_notes_conflict_resolution', |
|
|
203 | 203 | :lock_version => 2 |
|
|
204 | 204 | }, |
|
|
205 | 205 | :conflict_resolution => 'add_notes' |
|
|
206 | 206 | end |
|
|
207 | 207 | |
|
|
208 | 208 | assert_response 302 |
|
|
209 | 209 | issue = Issue.find(1) |
|
|
210 | 210 | assert_nil issue.fixed_version_id |
|
|
211 | 211 | journal = Journal.order('id DESC').first |
|
|
212 | 212 | assert_equal 'add_notes_conflict_resolution', journal.notes |
|
|
213 | assert_equal false, journal.private_notes | |
|
|
214 | assert journal.details.empty? | |
|
|
215 | end | |
|
|
216 | ||
|
|
217 | def test_update_stale_issue_with_add_notes_conflict_resolution_should_preserve_private_notes | |
|
|
218 | @request.session[:user_id] = 2 | |
|
|
219 | ||
|
|
220 | journal = new_record(Journal) do | |
|
|
221 | put :update, :id => 1, | |
|
|
222 | :issue => { | |
|
|
223 | :fixed_version_id => 4, | |
|
|
224 | :notes => 'add_privates_notes_conflict_resolution', | |
|
|
225 | :private_notes => '1', | |
|
|
226 | :lock_version => 2 | |
|
|
227 | }, | |
|
|
228 | :conflict_resolution => 'add_notes' | |
|
|
229 | end | |
|
|
230 | ||
|
|
231 | assert_response 302 | |
|
|
232 | assert_equal 'add_privates_notes_conflict_resolution', journal.notes | |
|
|
233 | assert_equal true, journal.private_notes | |
|
|
213 | 234 | assert journal.details.empty? |
|
|
214 | 235 | end |
|
|
215 | 236 | |
|
|
216 | 237 | def test_update_stale_issue_with_cancel_conflict_resolution_should_redirect_without_updating |
|
|
217 | 238 | @request.session[:user_id] = 2 |
|
|
218 | 239 | |
|
|
219 | 240 | assert_no_difference 'Journal.count' do |
|
|
220 | 241 | put :update, :id => 1, |
|
|
221 | 242 | :issue => { |
|
|
222 | 243 | :fixed_version_id => 4, |
|
|
223 | 244 | :notes => 'add_notes_conflict_resolution', |
|
|
224 | 245 | :lock_version => 2 |
|
|
225 | 246 | }, |
|
|
226 | 247 | :conflict_resolution => 'cancel' |
|
|
227 | 248 | end |
|
|
228 | 249 | |
|
|
229 | 250 | assert_redirected_to '/issues/1' |
|
|
230 | 251 | issue = Issue.find(1) |
|
|
231 | 252 | assert_nil issue.fixed_version_id |
|
|
232 | 253 | end |
|
|
233 | 254 | |
|
|
234 | 255 | def test_put_update_with_spent_time_and_failure_should_not_add_spent_time |
|
|
235 | 256 | @request.session[:user_id] = 2 |
|
|
236 | 257 | |
|
|
237 | 258 | assert_no_difference('TimeEntry.count') do |
|
|
238 | 259 | put :update, |
|
|
239 | 260 | :id => 1, |
|
|
240 | 261 | :issue => { :subject => '' }, |
|
|
241 | 262 | :time_entry => { :hours => '2.5', :comments => 'should not be added', :activity_id => TimeEntryActivity.first.id } |
|
|
242 | 263 | assert_response :success |
|
|
243 | 264 | end |
|
|
244 | 265 | |
|
|
245 | 266 | assert_select 'input[name=?][value=?]', 'time_entry[hours]', '2.5' |
|
|
246 | 267 | assert_select 'input[name=?][value=?]', 'time_entry[comments]', 'should not be added' |
|
|
247 | 268 | assert_select 'select[name=?]', 'time_entry[activity_id]' do |
|
|
248 | 269 | assert_select 'option[value=?][selected=selected]', TimeEntryActivity.first.id.to_s |
|
|
249 | 270 | end |
|
|
250 | 271 | end |
|
|
251 | 272 | |
|
|
252 | 273 | def test_index_should_rescue_invalid_sql_query |
|
|
253 | 274 | IssueQuery.any_instance.stubs(:statement).returns("INVALID STATEMENT") |
|
|
254 | 275 | |
|
|
255 | 276 | get :index |
|
|
256 | 277 | assert_response 500 |
|
|
257 | 278 | assert_select 'p', :text => /An error occurred/ |
|
|
258 | 279 | assert_nil session[:query] |
|
|
259 | 280 | assert_nil session[:issues_index_sort] |
|
|
260 | 281 | end |
|
|
261 | 282 | end |
General Comments 0
You need to be logged in to leave comments.
Login now