Fixed: issue status bulk edit broken by r2726 (#3347).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2744 e93f8b46-1217-0410-a6f0-8f06a7374b81

Fixed: issue status bulk edit broken by r2726 (#3347).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2744 e93f8b46-1217-0410-a6f0-8f06a7374b81
f7d7186c · Jean-Philippe Lang · e9a6730f · f7d7186c · f7d7186c
Commit f7d7186c authored May 14, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

issues_controller.rb app/controllers/issues_controller.rb +1 -1

issues_controller_test.rb test/functional/issues_controller_test.rb +12 -0

No files found.
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -256,7 +256,7 @@ class IssuesController < ApplicationController
        issue.custom_field_values = custom_field_values if custom_field_values && !custom_field_values.empty?
        call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
        # Don't save any change to the issue if the user is not authorized to apply the requested status
-        unless (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
+        unless (status.nil? || (issue.new_statuses_allowed_to(User.current).include?(status) && issue.status = status)) && issue.save
          # Keep unsaved issue ids to display them in flash error
          unsaved_issue_ids << issue.id
        end

--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -873,6 +873,18 @@ class IssuesControllerTest < Test::Unit::TestCase
    assert_equal 2, ActionMailer::Base.deliveries.size
  end

+  def test_bulk_edit_status
+    @request.session[:user_id] = 2
+    # update issues priority
+    post :bulk_edit, :ids => [1, 2], :priority_id => '',
+                                     :assigned_to_id => '',
+                                     :status_id => '5',
+                                     :notes => 'Bulk editing status'
+    assert_response 302
+    issue = Issue.find(1)
+    assert issue.closed?
+  end
+
  def test_bulk_edit_custom_field
    @request.session[:user_id] = 2
    # update issues priority