jro_apps/redmine Commit - r3854:2f529fd83402

Merged r3918 from trunk....

Eric Davis -

r3854:2f529fd83402

parent child

Context file:

r3854:2f529fd83402

Collapse all files

app/controllers/issues_controller.rb +6 -1

               default_search_scope :issues
               before_filter :find_issue, :only => [:show, :edit, :update, :reply]
-              before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
+              before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]
               before_filter :find_project, :only => [:new, :create, :update_form, :preview, :auto_complete]
               before_filter :authorize, :except => [:index, :changes, :preview, :context_menu]
               before_filter :find_optional_project, :only => [:index, :changes]
                 end
                 render :layout => false if request.xhr?
               end
+              # TODO: more descriptive name? move to separate controller like IssueMovesController?
+              def perform_move
+                move
+              end
               def destroy
                 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f

app/views/issues/move.rhtml +1 -1

             <% end -%>
             </ul>
-            <% form_tag({}, :id => 'move_form') do %>
+            <% form_tag({:action => 'perform_move'}, :id => 'move_form') do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
             <div class="box tabular">

config/routes.rb +1 -1

                   issues_actions.connect 'projects/:project_id/issues/gantt', :controller => 'gantts', :action => 'show'
                   issues_actions.connect 'projects/:project_id/issues/calendar', :controller => 'calendars', :action => 'show'
                   issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/
-                  issues_actions.connect 'issues/:id/:action', :action => /edit|move|destroy/, :id => /\d+/
+                  issues_actions.connect 'issues/:id/:action', :action => /edit|perform_move|destroy/, :id => /\d+/
                   issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/
                 end
                 issues_routes.with_options :conditions => {:method => :put} do |issues_actions|

lib/redmine.rb +1 -1

                 map.permission :add_issue_notes, {:issues => [:edit, :update, :reply]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
-                map.permission :move_issues, {:issues => :move}, :require => :loggedin
+                map.permission :move_issues, {:issues => [:move, :perform_move]}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member

test/functional/issues_controller_test.rb +13 -13

                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier
               end
-              def test_move_one_issue_to_another_project
+              def test_perform_move_one_issue_to_another_project
                 @request.session[:user_id] = 2
-                post :move, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
+                post :perform_move, :id => 1, :new_project_id => 2, :tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).project_id
               end
-              def test_move_one_issue_to_another_project_should_follow_when_needed
+              def test_perform_move_one_issue_to_another_project_should_follow_when_needed
                 @request.session[:user_id] = 2
-                post :move, :id => 1, :new_project_id => 2, :follow => '1'
+                post :perform_move, :id => 1, :new_project_id => 2, :follow => '1'
                 assert_redirected_to '/issues/1'
               end
-              def test_bulk_move_to_another_project
+              def test_bulk_perform_move_to_another_project
                 @request.session[:user_id] = 2
-                post :move, :ids => [1, 2], :new_project_id => 2
+                post :perform_move, :ids => [1, 2], :new_project_id => 2
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 # Issues moved to project 2
                 assert_equal 2, Issue.find(1).project_id
                 assert_equal 2, Issue.find(2).tracker_id
               end
-              def test_bulk_move_to_another_tracker
+              def test_bulk_perform_move_to_another_tracker
                 @request.session[:user_id] = 2
-                post :move, :ids => [1, 2], :new_tracker_id => 2
+                post :perform_move, :ids => [1, 2], :new_tracker_id => 2
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal 2, Issue.find(1).tracker_id
                 assert_equal 2, Issue.find(2).tracker_id
                 @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'}
+                    post :perform_move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}
                   end
                 end
                 assert_redirected_to 'projects/ecookbook/issues'
               end
-              context "#move via bulk copy" do
+              context "#perform_move via bulk copy" do
                 should "allow not changing the issue's attributes" do
                   @request.session[:user_id] = 2
                   issue_before_move = Issue.find(1)
                   assert_difference 'Issue.count', 1 do
                     assert_no_difference 'Project.find(1).issues.count' do
-                      post :move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
+                      post :perform_move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => '', :status_id => '', :start_date => '', :due_date => ''
                     end
                   end
                   issue_after_move = Issue.first(:order => 'id desc', :conditions => {:project_id => 2})
                   @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'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
+                      post :perform_move, :ids => [1, 2], :new_project_id => 2, :copy_options => {:copy => '1'}, :new_tracker_id => '', :assigned_to_id => 4, :status_id => 3, :start_date => '2009-12-01', :due_date => '2009-12-31'
                     end
                   end
               def test_copy_to_another_project_should_follow_when_needed
                 @request.session[:user_id] = 2
-                post :move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :follow => '1'
+                post :perform_move, :ids => [1], :new_project_id => 2, :copy_options => {:copy => '1'}, :follow => '1'
                 issue = Issue.first(:order => 'id DESC')
                 assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
               end

test/integration/routing_test.rb +1 -1

                 should_route :get, "/projects/23/issues/64/copy", :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64'
                 should_route :get, "/issues/1/move", :controller => 'issues', :action => 'move', :id => '1'
-                should_route :post, "/issues/1/move", :controller => 'issues', :action => 'move', :id => '1'
+                should_route :post, "/issues/1/perform_move", :controller => 'issues', :action => 'perform_move', :id => '1'
                 should_route :post, "/issues/1/quoted", :controller => 'issues', :action => 'reply', :id => '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