##// END OF EJS Templates
Fixed that update_form always proposes the default status when updating an existing issue (#15344)....
Jean-Philippe Lang -
r12047:71c61f4996ae
parent child
Show More

The requested changes are too big and content was truncated. Show full diff

@@ -1,477 +1,477
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2013 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 :find_project, :only => [:new, :create, :update_form]
25 25 before_filter :authorize, :except => [:index]
26 26 before_filter :find_optional_project, :only => [:index]
27 27 before_filter :check_for_default_issue_status, :only => [:new, :create]
28 28 before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
29 29 accept_rss_auth :index, :show
30 30 accept_api_auth :index, :show, :create, :update, :destroy
31 31
32 32 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
33 33
34 34 helper :journals
35 35 helper :projects
36 36 include ProjectsHelper
37 37 helper :custom_fields
38 38 include CustomFieldsHelper
39 39 helper :issue_relations
40 40 include IssueRelationsHelper
41 41 helper :watchers
42 42 include WatchersHelper
43 43 helper :attachments
44 44 include AttachmentsHelper
45 45 helper :queries
46 46 include QueriesHelper
47 47 helper :repositories
48 48 include RepositoriesHelper
49 49 helper :sort
50 50 include SortHelper
51 51 include IssuesHelper
52 52 helper :timelog
53 53 include Redmine::Export::PDF
54 54
55 55 def index
56 56 retrieve_query
57 57 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
58 58 sort_update(@query.sortable_columns)
59 59 @query.sort_criteria = sort_criteria.to_a
60 60
61 61 if @query.valid?
62 62 case params[:format]
63 63 when 'csv', 'pdf'
64 64 @limit = Setting.issues_export_limit.to_i
65 65 when 'atom'
66 66 @limit = Setting.feeds_limit.to_i
67 67 when 'xml', 'json'
68 68 @offset, @limit = api_offset_and_limit
69 69 else
70 70 @limit = per_page_option
71 71 end
72 72
73 73 @issue_count = @query.issue_count
74 74 @issue_pages = Paginator.new @issue_count, @limit, params['page']
75 75 @offset ||= @issue_pages.offset
76 76 @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
77 77 :order => sort_clause,
78 78 :offset => @offset,
79 79 :limit => @limit)
80 80 @issue_count_by_group = @query.issue_count_by_group
81 81
82 82 respond_to do |format|
83 83 format.html { render :template => 'issues/index', :layout => !request.xhr? }
84 84 format.api {
85 85 Issue.load_visible_relations(@issues) if include_in_api_response?('relations')
86 86 }
87 87 format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
88 88 format.csv { send_data(query_to_csv(@issues, @query, params), :type => 'text/csv; header=present', :filename => 'issues.csv') }
89 89 format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'issues.pdf') }
90 90 end
91 91 else
92 92 respond_to do |format|
93 93 format.html { render(:template => 'issues/index', :layout => !request.xhr?) }
94 94 format.any(:atom, :csv, :pdf) { render(:nothing => true) }
95 95 format.api { render_validation_errors(@query) }
96 96 end
97 97 end
98 98 rescue ActiveRecord::RecordNotFound
99 99 render_404
100 100 end
101 101
102 102 def show
103 103 @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
104 104 @journals.each_with_index {|j,i| j.indice = i+1}
105 105 @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
106 106 Journal.preload_journals_details_custom_fields(@journals)
107 107 # TODO: use #select! when ruby1.8 support is dropped
108 108 @journals.reject! {|journal| !journal.notes? && journal.visible_details.empty?}
109 109 @journals.reverse! if User.current.wants_comments_in_reverse_order?
110 110
111 111 @changesets = @issue.changesets.visible.all
112 112 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
113 113
114 114 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
115 115 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
116 116 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
117 117 @priorities = IssuePriority.active
118 118 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
119 119 @relation = IssueRelation.new
120 120
121 121 respond_to do |format|
122 122 format.html {
123 123 retrieve_previous_and_next_issue_ids
124 124 render :template => 'issues/show'
125 125 }
126 126 format.api
127 127 format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
128 128 format.pdf {
129 129 pdf = issue_to_pdf(@issue, :journals => @journals)
130 130 send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
131 131 }
132 132 end
133 133 end
134 134
135 135 # Add a new issue
136 136 # The new issue will be created from an existing one if copy_from parameter is given
137 137 def new
138 138 respond_to do |format|
139 139 format.html { render :action => 'new', :layout => !request.xhr? }
140 140 end
141 141 end
142 142
143 143 def create
144 144 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
145 145 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
146 146 if @issue.save
147 147 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
148 148 respond_to do |format|
149 149 format.html {
150 150 render_attachment_warning_if_needed(@issue)
151 151 flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject))
152 152 if params[:continue]
153 153 attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?}
154 154 redirect_to new_project_issue_path(@issue.project, :issue => attrs)
155 155 else
156 156 redirect_to issue_path(@issue)
157 157 end
158 158 }
159 159 format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
160 160 end
161 161 return
162 162 else
163 163 respond_to do |format|
164 164 format.html { render :action => 'new' }
165 165 format.api { render_validation_errors(@issue) }
166 166 end
167 167 end
168 168 end
169 169
170 170 def edit
171 171 return unless update_issue_from_params
172 172
173 173 respond_to do |format|
174 174 format.html { }
175 175 format.xml { }
176 176 end
177 177 end
178 178
179 179 def update
180 180 return unless update_issue_from_params
181 181 @issue.save_attachments(params[:attachments] || (params[:issue] && params[:issue][:uploads]))
182 182 saved = false
183 183 begin
184 184 saved = save_issue_with_child_records
185 185 rescue ActiveRecord::StaleObjectError
186 186 @conflict = true
187 187 if params[:last_journal_id]
188 188 @conflict_journals = @issue.journals_after(params[:last_journal_id]).all
189 189 @conflict_journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
190 190 end
191 191 end
192 192
193 193 if saved
194 194 render_attachment_warning_if_needed(@issue)
195 195 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
196 196
197 197 respond_to do |format|
198 198 format.html { redirect_back_or_default issue_path(@issue) }
199 199 format.api { render_api_ok }
200 200 end
201 201 else
202 202 respond_to do |format|
203 203 format.html { render :action => 'edit' }
204 204 format.api { render_validation_errors(@issue) }
205 205 end
206 206 end
207 207 end
208 208
209 209 # Updates the issue form when changing the project, status or tracker
210 210 # on issue creation/update
211 211 def update_form
212 212 end
213 213
214 214 # Bulk edit/copy a set of issues
215 215 def bulk_edit
216 216 @issues.sort!
217 217 @copy = params[:copy].present?
218 218 @notes = params[:notes]
219 219
220 220 if User.current.allowed_to?(:move_issues, @projects)
221 221 @allowed_projects = Issue.allowed_target_projects_on_move
222 222 if params[:issue]
223 223 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:issue][:project_id].to_s}
224 224 if @target_project
225 225 target_projects = [@target_project]
226 226 end
227 227 end
228 228 end
229 229 target_projects ||= @projects
230 230
231 231 if @copy
232 232 @available_statuses = [IssueStatus.default]
233 233 else
234 234 @available_statuses = @issues.map(&:new_statuses_allowed_to).reduce(:&)
235 235 end
236 236 @custom_fields = target_projects.map{|p|p.all_issue_custom_fields.visible}.reduce(:&)
237 237 @assignables = target_projects.map(&:assignable_users).reduce(:&)
238 238 @trackers = target_projects.map(&:trackers).reduce(:&)
239 239 @versions = target_projects.map {|p| p.shared_versions.open}.reduce(:&)
240 240 @categories = target_projects.map {|p| p.issue_categories}.reduce(:&)
241 241 if @copy
242 242 @attachments_present = @issues.detect {|i| i.attachments.any?}.present?
243 243 @subtasks_present = @issues.detect {|i| !i.leaf?}.present?
244 244 end
245 245
246 246 @safe_attributes = @issues.map(&:safe_attribute_names).reduce(:&)
247 247
248 248 @issue_params = params[:issue] || {}
249 249 @issue_params[:custom_field_values] ||= {}
250 250 end
251 251
252 252 def bulk_update
253 253 @issues.sort!
254 254 @copy = params[:copy].present?
255 255 attributes = parse_params_for_bulk_issue_attributes(params)
256 256
257 257 unsaved_issues = []
258 258 saved_issues = []
259 259
260 260 if @copy && params[:copy_subtasks].present?
261 261 # Descendant issues will be copied with the parent task
262 262 # Don't copy them twice
263 263 @issues.reject! {|issue| @issues.detect {|other| issue.is_descendant_of?(other)}}
264 264 end
265 265
266 266 @issues.each do |orig_issue|
267 267 orig_issue.reload
268 268 if @copy
269 269 issue = orig_issue.copy({},
270 270 :attachments => params[:copy_attachments].present?,
271 271 :subtasks => params[:copy_subtasks].present?
272 272 )
273 273 else
274 274 issue = orig_issue
275 275 end
276 276 journal = issue.init_journal(User.current, params[:notes])
277 277 issue.safe_attributes = attributes
278 278 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
279 279 if issue.save
280 280 saved_issues << issue
281 281 else
282 282 unsaved_issues << orig_issue
283 283 end
284 284 end
285 285
286 286 if unsaved_issues.empty?
287 287 flash[:notice] = l(:notice_successful_update) unless saved_issues.empty?
288 288 if params[:follow]
289 289 if @issues.size == 1 && saved_issues.size == 1
290 290 redirect_to issue_path(saved_issues.first)
291 291 elsif saved_issues.map(&:project).uniq.size == 1
292 292 redirect_to project_issues_path(saved_issues.map(&:project).first)
293 293 end
294 294 else
295 295 redirect_back_or_default _project_issues_path(@project)
296 296 end
297 297 else
298 298 @saved_issues = @issues
299 299 @unsaved_issues = unsaved_issues
300 300 @issues = Issue.visible.find_all_by_id(@unsaved_issues.map(&:id))
301 301 bulk_edit
302 302 render :action => 'bulk_edit'
303 303 end
304 304 end
305 305
306 306 def destroy
307 307 @hours = TimeEntry.where(:issue_id => @issues.map(&:id)).sum(:hours).to_f
308 308 if @hours > 0
309 309 case params[:todo]
310 310 when 'destroy'
311 311 # nothing to do
312 312 when 'nullify'
313 313 TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
314 314 when 'reassign'
315 315 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
316 316 if reassign_to.nil?
317 317 flash.now[:error] = l(:error_issue_not_found_in_project)
318 318 return
319 319 else
320 320 TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
321 321 end
322 322 else
323 323 # display the destroy form if it's a user request
324 324 return unless api_request?
325 325 end
326 326 end
327 327 @issues.each do |issue|
328 328 begin
329 329 issue.reload.destroy
330 330 rescue ::ActiveRecord::RecordNotFound # raised by #reload if issue no longer exists
331 331 # nothing to do, issue was already deleted (eg. by a parent)
332 332 end
333 333 end
334 334 respond_to do |format|
335 335 format.html { redirect_back_or_default _project_issues_path(@project) }
336 336 format.api { render_api_ok }
337 337 end
338 338 end
339 339
340 340 private
341 341
342 342 def find_project
343 343 project_id = params[:project_id] || (params[:issue] && params[:issue][:project_id])
344 344 @project = Project.find(project_id)
345 345 rescue ActiveRecord::RecordNotFound
346 346 render_404
347 347 end
348 348
349 349 def retrieve_previous_and_next_issue_ids
350 350 retrieve_query_from_session
351 351 if @query
352 352 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
353 353 sort_update(@query.sortable_columns, 'issues_index_sort')
354 354 limit = 500
355 355 issue_ids = @query.issue_ids(:order => sort_clause, :limit => (limit + 1), :include => [:assigned_to, :tracker, :priority, :category, :fixed_version])
356 356 if (idx = issue_ids.index(@issue.id)) && idx < limit
357 357 if issue_ids.size < 500
358 358 @issue_position = idx + 1
359 359 @issue_count = issue_ids.size
360 360 end
361 361 @prev_issue_id = issue_ids[idx - 1] if idx > 0
362 362 @next_issue_id = issue_ids[idx + 1] if idx < (issue_ids.size - 1)
363 363 end
364 364 end
365 365 end
366 366
367 367 # Used by #edit and #update to set some common instance variables
368 368 # from the params
369 369 # TODO: Refactor, not everything in here is needed by #edit
370 370 def update_issue_from_params
371 371 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
372 372 @time_entry = TimeEntry.new(:issue => @issue, :project => @issue.project)
373 373 @time_entry.attributes = params[:time_entry]
374 374
375 375 @issue.init_journal(User.current)
376 376
377 377 issue_attributes = params[:issue]
378 378 if issue_attributes && params[:conflict_resolution]
379 379 case params[:conflict_resolution]
380 380 when 'overwrite'
381 381 issue_attributes = issue_attributes.dup
382 382 issue_attributes.delete(:lock_version)
383 383 when 'add_notes'
384 384 issue_attributes = issue_attributes.slice(:notes)
385 385 when 'cancel'
386 386 redirect_to issue_path(@issue)
387 387 return false
388 388 end
389 389 end
390 390 @issue.safe_attributes = issue_attributes
391 391 @priorities = IssuePriority.active
392 392 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
393 393 true
394 394 end
395 395
396 396 # TODO: Refactor, lots of extra code in here
397 397 # TODO: Changing tracker on an existing issue should not trigger this
398 398 def build_new_issue_from_params
399 399 if params[:id].blank?
400 400 @issue = Issue.new
401 401 if params[:copy_from]
402 402 begin
403 403 @copy_from = Issue.visible.find(params[:copy_from])
404 404 @copy_attachments = params[:copy_attachments].present? || request.get?
405 405 @copy_subtasks = params[:copy_subtasks].present? || request.get?
406 406 @issue.copy_from(@copy_from, :attachments => @copy_attachments, :subtasks => @copy_subtasks)
407 407 rescue ActiveRecord::RecordNotFound
408 408 render_404
409 409 return
410 410 end
411 411 end
412 412 @issue.project = @project
413 413 else
414 414 @issue = @project.issues.visible.find(params[:id])
415 415 end
416 416
417 417 @issue.project = @project
418 418 @issue.author ||= User.current
419 419 # Tracker must be set before custom field values
420 420 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
421 421 if @issue.tracker.nil?
422 422 render_error l(:error_no_tracker_in_project)
423 423 return false
424 424 end
425 425 @issue.start_date ||= Date.today if Setting.default_issue_start_date_to_creation_date?
426 426 @issue.safe_attributes = params[:issue]
427 427
428 428 @priorities = IssuePriority.active
429 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
429 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, @issue.new_record?)
430 430 @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
431 431 end
432 432
433 433 def check_for_default_issue_status
434 434 if IssueStatus.default.nil?
435 435 render_error l(:error_no_default_issue_status)
436 436 return false
437 437 end
438 438 end
439 439
440 440 def parse_params_for_bulk_issue_attributes(params)
441 441 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
442 442 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
443 443 if custom = attributes[:custom_field_values]
444 444 custom.reject! {|k,v| v.blank?}
445 445 custom.keys.each do |k|
446 446 if custom[k].is_a?(Array)
447 447 custom[k] << '' if custom[k].delete('__none__')
448 448 else
449 449 custom[k] = '' if custom[k] == '__none__'
450 450 end
451 451 end
452 452 end
453 453 attributes
454 454 end
455 455
456 456 # Saves @issue and a time_entry from the parameters
457 457 def save_issue_with_child_records
458 458 Issue.transaction do
459 459 if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, @issue.project)
460 460 time_entry = @time_entry || TimeEntry.new
461 461 time_entry.project = @issue.project
462 462 time_entry.issue = @issue
463 463 time_entry.user = User.current
464 464 time_entry.spent_on = User.current.today
465 465 time_entry.attributes = params[:time_entry]
466 466 @issue.time_entries << time_entry
467 467 end
468 468
469 469 call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
470 470 if @issue.save
471 471 call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => time_entry, :journal => @issue.current_journal})
472 472 else
473 473 raise ActiveRecord::Rollback
474 474 end
475 475 end
476 476 end
477 477 end
1 NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now