jro_apps/redmine Commit - r9220:34016c38bd2d

Merged r9349 from trunk....

Jean-Philippe Lang -

r9220:34016c38bd2d

parent child

Context file:

r9220:34016c38bd2d

Collapse all files

app/controllers/issues_controller.rb +10 -1

@@ -420,7 +420,16 private
420	def parse_params_for_bulk_issue_attributes(params)	420	def parse_params_for_bulk_issue_attributes(params)
421	attributes = (params[:issue] \|\| {}).reject {\|k,v\| v.blank?}	421	attributes = (params[:issue] \|\| {}).reject {\|k,v\| v.blank?}
422	attributes.keys.each {\|k\| attributes[k] = '' if attributes[k] == 'none'}	422	attributes.keys.each {\|k\| attributes[k] = '' if attributes[k] == 'none'}
423	attributes[:custom_field_values].reject! {\|k,v\| v.blank?} if attributes[:custom_field_values]	423	if custom = attributes[:custom_field_values]
		424	custom.reject! {\|k,v\| v.blank?}
		425	custom.keys.each do \|k\|
		426	if custom[k].is_a?(Array)
		427	custom[k] << '' if custom[k].delete('__none__')
		428	else
		429	custom[k] = '' if custom[k] == '__none__'
		430	end
		431	end
		432	end
424	attributes	433	attributes
425	end	434	end
426	end	435	end

app/helpers/custom_fields_helper.rb +1 0

                   when "list"
                     options = []
                     options << [l(:label_no_change_option), ''] unless custom_field.multiple?
+                    options << [l(:label_none), '__none__'] unless custom_field.is_required?
                     options += custom_field.possible_values_options(projects)
                     select_tag(field_name, options_for_select(options),
                       :id => field_id, :multiple => custom_field.multiple?)

test/functional/issues_controller_test.rb +28 -3

                   :attributes => {:name => "issue[custom_field_values][#{field.id}]"},
                   :children => {
                     :only => {:tag => 'option'},
-                    :count => Project.find(1).users.count + 1
+                    :count => Project.find(1).users.count + 2 # "no change" + "none" options
                   }
               end
                   :attributes => {:name => "issue[custom_field_values][#{field.id}]"},
                   :children => {
                     :only => {:tag => 'option'},
-                    :count => Project.find(1).shared_versions.count + 1
+                    :count => Project.find(1).shared_versions.count + 2 # "no change" + "none" options
                   }
               end
                   :attributes => {:name => "issue[custom_field_values][1][]"},
                   :children => {
                     :only => {:tag => 'option'},
-                    :count => 3
+                    :count => field.possible_values.size + 1 # "none" options
                   }
               end
                 assert_equal '777', journal.details.first.value
               end
+              def test_bulk_update_custom_field_to_blank
+                @request.session[:user_id] = 2
+                post :bulk_update, :ids => [1, 3], :notes => 'Bulk editing custom field',
+                                                 :issue => {:priority_id => '',
+                                                            :assigned_to_id => '',
+                                                            :custom_field_values => {'1' => '__none__'}}
+                assert_response 302
+                assert_equal '', Issue.find(1).custom_field_value(1)
+                assert_equal '', Issue.find(3).custom_field_value(1)
+              end
               def test_bulk_update_multi_custom_field
                 field = CustomField.find(1)
                 field.update_attribute :multiple, true
                 assert_nil Issue.find(2).custom_field_value(1)
               end
+              def test_bulk_update_multi_custom_field_to_blank
+                field = CustomField.find(1)
+                field.update_attribute :multiple, true
+                @request.session[:user_id] = 2
+                post :bulk_update, :ids => [1, 3], :notes => 'Bulk editing multi custom field',
+                                                 :issue => {:priority_id => '',
+                                                            :assigned_to_id => '',
+                                                            :custom_field_values => {'1' => ['__none__']}}
+                assert_response 302
+                assert_equal [''], Issue.find(1).custom_field_value(1)
+                assert_equal [''], Issue.find(3).custom_field_value(1)
+              end
               def test_bulk_update_unassign
                 assert_not_nil Issue.find(2).assigned_to
                 @request.session[:user_id] = 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