jro_apps/redmine Commit - r3364:e24d6cc2237d

Bulk edit refactoring....

Jean-Philippe Lang -

r3364:e24d6cc2237d

parent child

Context file:

r3364:e24d6cc2237d

Collapse all files

app/controllers/issues_controller.rb +8 -21

@@ -260,29 +260,16 class IssuesController < ApplicationController
260	# Bulk edit a set of issues	260	# Bulk edit a set of issues
261	def bulk_edit	261	def bulk_edit
262	if request.post?	262	if request.post?
263	tracker = params[:tracker_id].blank? ? nil : @project.trackers.find_by_id(params[:tracker_id])	263	attributes = (params[:issue] \|\| {}).reject {\|k,v\| v.blank?}
264	status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])	264	attributes.keys.each {\|k\| attributes[k] = '' if attributes[k] == 'none'}
265	priority = params[:priority_id].blank? ? nil : IssuePriority.find_by_id(params[:priority_id])	265	attributes[:custom_field_values].reject! {\|k,v\| v.blank?} if attributes[:custom_field_values]
266	assigned_to = (params[:assigned_to_id].blank? \|\| params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
267	category = (params[:category_id].blank? \|\| params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
268	fixed_version = (params[:fixed_version_id].blank? \|\| params[:fixed_version_id] == 'none') ? nil : @project.shared_versions.find_by_id(params[:fixed_version_id])
269	custom_field_values = params[:custom_field_values] ? params[:custom_field_values].reject {\|k,v\| v.blank?} : nil
270
271	# Need to merge in the records found above for Issue#bulk_edit.
272	# Assuming this is done so the associations are only looked up once.
273	merged_params = params.merge({
274	:tracker => tracker,
275	:status => status,
276	:priority => priority,
277	:assigned_to => assigned_to,
278	:category => category,
279	:fixed_version => fixed_version,
280	:custom_field_values => custom_field_values
281	})
282		266
283	unsaved_issue_ids = []	267	unsaved_issue_ids = []
284	@issues.each do \|issue\|	268	@issues.each do \|issue\|
285	unless issue.bulk_edit(merged_params)	269	journal = issue.init_journal(User.current, params[:notes])
		270	issue.safe_attributes = attributes
		271	call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
		272	unless issue.save
286	# Keep unsaved issue ids to display them in flash error	273	# Keep unsaved issue ids to display them in flash error
287	unsaved_issue_ids << issue.id	274	unsaved_issue_ids << issue.id
288	end	275	end

app/helpers/custom_fields_helper.rb +3 -3

                 custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
               end
-              def custom_field_tag_for_bulk_edit(custom_field)
+              def custom_field_tag_for_bulk_edit(name, custom_field)
-                field_name = "custom_field_values[#{custom_field.id}]"
+                field_name = "#{name}[custom_field_values][#{custom_field.id}]"
-                field_id = "custom_field_values_#{custom_field.id}"
+                field_id = "#{name}_custom_field_values_#{custom_field.id}"
                 case custom_field.field_format
                   when "date"
                     text_field_tag(field_name, '', :id => field_id, :size => 10) +

app/models/issue.rb +7 -19

@@ -136,24 +136,6 class Issue < ActiveRecord::Base
136	end	136	end
137	return issue	137	return issue
138	end	138	end
139
140	def bulk_edit(params)
141	journal = init_journal(User.current, params[:notes])
142	self.tracker = params[:tracker] if params[:tracker]
143	self.priority = params[:priority] if params[:priority]
144	self.assigned_to = params[:assigned_to] if params[:assigned_to] \|\| params[:assigned_to_id] == 'none'
145	self.category = params[:category] if params[:category] \|\| params[:category_id] == 'none'
146	self.fixed_version = params[:fixed_version] if params[:fixed_version] \|\| params[:fixed_version_id] == 'none'
147	self.start_date = params[:start_date] unless params[:start_date].blank?
148	self.due_date = params[:due_date] unless params[:due_date].blank?
149	self.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
150	self.custom_field_values = params[:custom_field_values] if params[:custom_field_values] && !params[:custom_field_values].empty?
151	# TODO: Edit hook name
152	Redmine::Hook.call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => self })
153
154	# Don't save any change to the issue if the user is not authorized to apply the requested status
155	return (params[:status].nil? \|\| (new_statuses_allowed_to(User.current).include?(params[:status]) && self.status = params[:status])) && save
156	end
157		139
158	def priority_id=(pid)	140	def priority_id=(pid)
159	self.priority = nil	141	self.priority = nil
@@ -206,7 +188,13 class Issue < ActiveRecord::Base
206	# TODO: move workflow/permission checks from controllers to here	188	# TODO: move workflow/permission checks from controllers to here
207	def safe_attributes=(attrs, user=User.current)	189	def safe_attributes=(attrs, user=User.current)
208	return if attrs.nil?	190	return if attrs.nil?
209	~~self~~.attr~~ibute~~s = attrs.reject {\|k,v\| !SAFE_ATTRIBUTES.include?(k)}	191	attrs = attrs.reject {\|k,v\| !SAFE_ATTRIBUTES.include?(k)}
		192	if attrs['status_id']
		193	unless new_statuses_allowed_to(user).collect(&:id).include?(attrs['status_id'].to_i)
		194	attrs.delete('status_id')
		195	end
		196	end
		197	self.attributes = attrs
210	end	198	end
211		199
212	def done_ratio	200	def done_ratio

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

             <div class="splitcontentleft">
             <p>
             	<label><%= l(:field_tracker) %></label>
-            	<%= select_tag('tracker_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.trackers, :id, :name)) %>
+            	<%= select_tag('issue[tracker_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.trackers, :id, :name)) %>
             </p>
             <% if @available_statuses.any? %>
             <p>
             	<label><%= l(:field_status) %></label>
-            	<%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
+            	<%= select_tag('issue[status_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
             </p>
             <% end %>
             <p>
             	<label><%= l(:field_priority) %></label>
-            	<%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+            	<%= select_tag('issue[priority_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
             </p>
             <p>
             	<label><%= l(:field_assigned_to) %></label>
-            	<%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
+            	<%= select_tag('issue[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                              content_tag('option', l(:label_nobody), :value => 'none') +
                                              options_from_collection_for_select(@project.assignable_users, :id, :name)) %>
             </p>
             <p>
             	<label><%= l(:field_category) %></label>
-            	<%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
+            	<%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                             content_tag('option', l(:label_none), :value => 'none') +
                                             options_from_collection_for_select(@project.issue_categories, :id, :name)) %>
             </p>
             <p>
             	<label><%= l(:field_fixed_version) %></label>
-            	<%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
+            	<%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
                                                content_tag('option', l(:label_none), :value => 'none') +
                                                version_options_for_select(@project.shared_versions.open)) %>
             </p>
             <% @custom_fields.each do |custom_field| %>
-            	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit(custom_field) %></p>
+            	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field) %></p>
             <% end %>
             <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
             <div class="splitcontentright">
             <p>
             	<label><%= l(:field_start_date) %></label>
-            	<%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
+            	<%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>
             </p>
             <p>
             	<label><%= l(:field_due_date) %></label>
-            	<%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
+            	<%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %>
             </p>
             <% if Issue.use_field_for_done_ratio? %>
             <p>
             	<label><%= l(:field_done_ratio) %></label>
-            	<%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
+            	<%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
             </p>
             <% end %>
             </div>

test/functional/issues_controller_test.rb +25 -22

                 field = CustomField.find(9)
                 assert !field.is_for_all?
                 assert_equal 'date', field.field_format
-                assert_tag :input, :attributes => {:name => 'custom_field_values[9]'}
+                assert_tag :input, :attributes => {:name => 'issue[custom_field_values][9]'}
                 # System wide custom field
                 assert CustomField.find(1).is_for_all?
-                assert_tag :select, :attributes => {:name => 'custom_field_values[1]'}
+                assert_tag :select, :attributes => {:name => 'issue[custom_field_values][1]'}
               end
               def test_bulk_edit
                 @request.session[:user_id] = 2
                 # update issues priority
-                post :bulk_edit, :ids => [1, 2], :priority_id => 7,
+                post :bulk_edit, :ids => [1, 2], :notes => 'Bulk editing',
-                                                 :assigned_to_id => '',
+                                                 :issue => {:priority_id => 7,
-                                                 :custom_field_values => {'2' => ''},
+                                                            :assigned_to_id => '',
-                                                 :notes => 'Bulk editing'
+                                                            :custom_field_values => {'2' => ''}}
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
                 post(:bulk_edit,
                      {
                        :ids => [1, 2],
-                       :priority_id => 7,
+                       :notes => 'Bulk editing',
-                       :assigned_to_id => '',
+                       :issue => {
-                       :custom_field_values => {'2' => ''},
+                         :priority_id => 7,
-                       :notes => 'Bulk editing'
+                         :assigned_to_id => '',
+                         :custom_field_values => {'2' => ''}
+                       }
                      })
                 assert_response 302
               def test_bulk_edit_status
                 @request.session[:user_id] = 2
                 # update issues priority
-                post :bulk_edit, :ids => [1, 2], :priority_id => '',
+                post :bulk_edit, :ids => [1, 2], :notes => 'Bulk editing status',
-                                                 :assigned_to_id => '',
+                                                 :issue => {:priority_id => '',
-                                                 :status_id => '5',
+                                                            :assigned_to_id => '',
-                                                 :notes => 'Bulk editing status'
+                                                            :status_id => '5'}
                 assert_response 302
                 issue = Issue.find(1)
                 assert issue.closed?
               def test_bulk_edit_custom_field
                 @request.session[:user_id] = 2
                 # update issues priority
-                post :bulk_edit, :ids => [1, 2], :priority_id => '',
+                post :bulk_edit, :ids => [1, 2], :notes => 'Bulk editing custom field',
-                                                 :assigned_to_id => '',
+                                                 :issue => {:priority_id => '',
-                                                 :custom_field_values => {'2' => '777'},
+                                                            :assigned_to_id => '',
-                                                 :notes => 'Bulk editing custom field'
+                                                            :custom_field_values => {'2' => '777'}}
                 assert_response 302
                 issue = Issue.find(1)
                 assert_not_nil Issue.find(2).assigned_to
                 @request.session[:user_id] = 2
                 # unassign issues
-                post :bulk_edit, :ids => [1, 2], :notes => 'Bulk unassigning', :assigned_to_id => 'none'
+              post :bulk_edit, :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
               def test_post_bulk_edit_should_allow_fixed_version_to_be_set_to_a_subproject
                 @request.session[:user_id] = 2
-                post :bulk_edit,
+                post :bulk_edit, :ids => [1,2], :issue => {:fixed_version_id => 4}
-                     :ids => [1,2],
-                     :fixed_version_id => 4
                 assert_response :redirect
                 issues = Issue.find([1,2])

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