jro_apps/redmine Commit - r3923:80256cf298e6

Refactor: extract #bulk_update method from IssuesController#bulk_edit....

Eric Davis -

r3923:80256cf298e6

parent child

Context file:

r3923:80256cf298e6

Collapse all files

app/controllers/issues_controller.rb +24 -21

@@ -20,7 +20,7 class IssuesController < ApplicationController
20	default_search_scope :issues	20	default_search_scope :issues
21		21
22	before_filter :find_issue, :only => [:show, :edit, :update]	22	before_filter :find_issue, :only => [:show, :edit, :update]
23	before_filter :find_issues, :only => [:bulk_edit, :move, :perform_move, :destroy]	23	before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :move, :perform_move, :destroy]
24	before_filter :find_project, :only => [:new, :create]	24	before_filter :find_project, :only => [:new, :create]
25	before_filter :authorize, :except => [:index]	25	before_filter :authorize, :except => [:index]
26	before_filter :find_optional_project, :only => [:index]	26	before_filter :find_optional_project, :only => [:index]
@@ -54,6 +54,7 class IssuesController < ApplicationController
54	:render => { :nothing => true, :status => :method_not_allowed }	54	:render => { :nothing => true, :status => :method_not_allowed }
55		55
56	verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }	56	verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
		57	verify :method => :post, :only => :bulk_update, :render => {:nothing => true, :status => :method_not_allowed }
57	verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }	58	verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
58		59
59	def index	60	def index
@@ -191,29 +192,31 class IssuesController < ApplicationController
191	# Bulk edit a set of issues	192	# Bulk edit a set of issues
192	def bulk_edit	193	def bulk_edit
193	@issues.sort!	194	@issues.sort!
194	if request.post?
195	attributes = (params[:issue] \|\| {}).reject {\|k,v\| v.blank?}
196	attributes.keys.each {\|k\| attributes[k] = '' if attributes[k] == 'none'}
197	attributes[:custom_field_values].reject! {\|k,v\| v.blank?} if attributes[:custom_field_values]
198
199	unsaved_issue_ids = []
200	@issues.each do \|issue\|
201	issue.reload
202	journal = issue.init_journal(User.current, params[:notes])
203	issue.safe_attributes = attributes
204	call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
205	unless issue.save
206	# Keep unsaved issue ids to display them in flash error
207	unsaved_issue_ids << issue.id
208	end
209	end
210	set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
211	redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
212	return
213	end
214	@available_statuses = Workflow.available_statuses(@project)	195	@available_statuses = Workflow.available_statuses(@project)
215	@custom_fields = @project.all_issue_custom_fields	196	@custom_fields = @project.all_issue_custom_fields
216	end	197	end
		198
		199	def bulk_update
		200	@issues.sort!
		201
		202	attributes = (params[:issue] \|\| {}).reject {\|k,v\| v.blank?}
		203	attributes.keys.each {\|k\| attributes[k] = '' if attributes[k] == 'none'}
		204	attributes[:custom_field_values].reject! {\|k,v\| v.blank?} if attributes[:custom_field_values]
		205
		206	unsaved_issue_ids = []
		207	@issues.each do \|issue\|
		208	issue.reload
		209	journal = issue.init_journal(User.current, params[:notes])
		210	issue.safe_attributes = attributes
		211	call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
		212	unless issue.save
		213	# Keep unsaved issue ids to display them in flash error
		214	unsaved_issue_ids << issue.id
		215	end
		216	end
		217	set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
		218	redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
		219	end
217		220
218	def destroy	221	def destroy
219	@hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f	222	@hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f

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

             <ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
-            <% form_tag() do %>
+            <% form_tag(:action => 'bulk_update') do %>
             <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
             <div class="box tabular">
             <fieldset class="attributes">

config/routes.rb +1 0

                   issues_actions.connect 'issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/
                   issues_actions.connect 'issues/:id/:action', :action => /edit|destroy/, :id => /\d+/
                   issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/
+                  issues_actions.connect 'issues/bulk_edit', :action => 'bulk_update'
                 end
                 issues_routes.with_options :conditions => {:method => :put} do |issues_actions|
                   issues_actions.connect 'issues/:id/edit', :action => 'update', :id => /\d+/

lib/redmine.rb +1 -1

                                               :queries => :index,
                                               :reports => [:issue_report, :issue_report_details]}
                 map.permission :add_issues, {:issues => [:new, :create, :update_form]}
-                map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :update_form], :journals => [:new]}
+                map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :manage_subtasks, {}
                 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}

test/functional/issues_controller_test.rb +16 -16

                 assert_tag :select, :attributes => {:name => 'issue[custom_field_values][1]'}
               end
-              def test_bulk_edit
+              def test_bulk_update
                 @request.session[:user_id] = 2
                 # update issues priority
-                post :bulk_edit, :ids => [1, 2], :notes => 'Bulk editing',
+                post :bulk_update, :ids => [1, 2], :notes => 'Bulk editing',
                                                  :issue => {:priority_id => 7,
                                                             :assigned_to_id => '',
                                                             :custom_field_values => {'2' => ''}}
                 assert_equal 1, journal.details.size
               end
-              def test_bullk_edit_should_send_a_notification
+              def test_bullk_update_should_send_a_notification
                 @request.session[:user_id] = 2
                 ActionMailer::Base.deliveries.clear
-                post(:bulk_edit,
+                post(:bulk_update,
                      {
                        :ids => [1, 2],
                        :notes => 'Bulk editing',
                 assert_equal 2, ActionMailer::Base.deliveries.size
               end
-              def test_bulk_edit_status
+              def test_bulk_update_status
                 @request.session[:user_id] = 2
                 # update issues priority
-                post :bulk_edit, :ids => [1, 2], :notes => 'Bulk editing status',
+                post :bulk_update, :ids => [1, 2], :notes => 'Bulk editing status',
                                                  :issue => {:priority_id => '',
                                                             :assigned_to_id => '',
                                                             :status_id => '5'}
                 assert issue.closed?
               end
-              def test_bulk_edit_custom_field
+              def test_bulk_update_custom_field
                 @request.session[:user_id] = 2
                 # update issues priority
-                post :bulk_edit, :ids => [1, 2], :notes => 'Bulk editing custom field',
+                post :bulk_update, :ids => [1, 2], :notes => 'Bulk editing custom field',
                                                  :issue => {:priority_id => '',
                                                             :assigned_to_id => '',
                                                             :custom_field_values => {'2' => '777'}}
                 assert_equal '777', journal.details.first.value
               end
-              def test_bulk_unassign
+              def test_bulk_update_unassign
                 assert_not_nil Issue.find(2).assigned_to
                 @request.session[:user_id] = 2
                 # unassign issues
-              post :bulk_edit, :ids => [1, 2], :notes => 'Bulk unassigning', :issue => {:assigned_to_id => 'none'}
+                post :bulk_update, :ids => [1, 2], :notes => 'Bulk unassigning', :issue => {:assigned_to_id => 'none'}
                 assert_response 302
                 # check that the issues were updated
                 assert_nil Issue.find(2).assigned_to
               end
-              def test_post_bulk_edit_should_allow_fixed_version_to_be_set_to_a_subproject
+              def test_post_bulk_update_should_allow_fixed_version_to_be_set_to_a_subproject
                 @request.session[:user_id] = 2
-                post :bulk_edit, :ids => [1,2], :issue => {:fixed_version_id => 4}
+                post :bulk_update, :ids => [1,2], :issue => {:fixed_version_id => 4}
                 assert_response :redirect
                 issues = Issue.find([1,2])
                 end
               end
-              def test_post_bulk_edit_should_redirect_back_using_the_back_url_parameter
+              def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
                 @request.session[:user_id] = 2
-                post :bulk_edit, :ids => [1,2], :back_url => '/issues'
+                post :bulk_update, :ids => [1,2], :back_url => '/issues'
                 assert_response :redirect
                 assert_redirected_to '/issues'
               end
-              def test_post_bulk_edit_should_not_redirect_back_using_the_back_url_parameter_off_the_host
+              def test_post_bulk_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
                 @request.session[:user_id] = 2
-                post :bulk_edit, :ids => [1,2], :back_url => 'http://google.com'
+                post :bulk_update, :ids => [1,2], :back_url => 'http://google.com'
                 assert_response :redirect
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => Project.find(1).identifier

test/integration/routing_test.rb +3 0

                 should_route :post, "/issues/context_menu", :controller => 'context_menus', :action => 'issues'
                 should_route :get, "/issues/changes", :controller => 'journals', :action => 'index'
+                should_route :get, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_edit'
+                should_route :post, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_update'
               end
               context "issue categories" do

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