jro_apps/redmine Commit - r2639:566d0a6ceb12

Fixed: issue move by non-admin broken by r2726 (#3354)....

Jean-Philippe Lang -

r2639:566d0a6ceb12

parent child

Context file:

r2639:566d0a6ceb12

Collapse all files

app/controllers/issues_controller.rb +1 -1

                   # admin is allowed to move issues to any active (visible) project
                   @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current))
                 else
-                  User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
+                  User.current.memberships.each {|m| @allowed_projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
                 end
                 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                 @target_project ||= @project

test/functional/issues_controller_test.rb +4 -4

               end
               def test_move_one_issue_to_another_project
-                @request.session[:user_id] = 1
+                @request.session[:user_id] = 2
                 post :move, :id => 1, :new_project_id => 2
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).project_id
               end
               def test_bulk_move_to_another_project
-                @request.session[:user_id] = 1
+                @request.session[:user_id] = 2
                 post :move, :ids => [1, 2], :new_project_id => 2
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 # Issues moved to project 2
               end
               def test_bulk_move_to_another_tracker
-                @request.session[:user_id] = 1
+                @request.session[:user_id] = 2
                 post :move, :ids => [1, 2], :new_tracker_id => 2
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).tracker_id
               end
               def test_bulk_copy_to_another_project
-                @request.session[:user_id] = 1
+                @request.session[:user_id] = 2
                 assert_difference 'Issue.count', 2 do
                   assert_no_difference 'Project.find(1).issues.count' do
                     post :move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages