##// END OF EJS Templates
Fixed: issue status bulk edit broken by r2726 (#3347)....
Jean-Philippe Lang -
r2645:f7d7186c133d
parent child
Show More
@@ -256,7 +256,7 class IssuesController < ApplicationController
256 issue.custom_field_values = custom_field_values if custom_field_values && !custom_field_values.empty?
256 issue.custom_field_values = custom_field_values if custom_field_values && !custom_field_values.empty?
257 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
257 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
258 # Don't save any change to the issue if the user is not authorized to apply the requested status
258 # Don't save any change to the issue if the user is not authorized to apply the requested status
259 unless (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
259 unless (status.nil? || (issue.new_statuses_allowed_to(User.current).include?(status) && issue.status = status)) && issue.save
260 # Keep unsaved issue ids to display them in flash error
260 # Keep unsaved issue ids to display them in flash error
261 unsaved_issue_ids << issue.id
261 unsaved_issue_ids << issue.id
262 end
262 end
@@ -873,6 +873,18 class IssuesControllerTest < Test::Unit::TestCase
873 assert_equal 2, ActionMailer::Base.deliveries.size
873 assert_equal 2, ActionMailer::Base.deliveries.size
874 end
874 end
875
875
876 def test_bulk_edit_status
877 @request.session[:user_id] = 2
878 # update issues priority
879 post :bulk_edit, :ids => [1, 2], :priority_id => '',
880 :assigned_to_id => '',
881 :status_id => '5',
882 :notes => 'Bulk editing status'
883 assert_response 302
884 issue = Issue.find(1)
885 assert issue.closed?
886 end
887
876 def test_bulk_edit_custom_field
888 def test_bulk_edit_custom_field
877 @request.session[:user_id] = 2
889 @request.session[:user_id] = 2
878 # update issues priority
890 # update issues priority
General Comments 0
You need to be logged in to leave comments. Login now