jro_apps/redmine Commit - r14391:e6112a9710cb

New custom fields of existing issues are not initialized with their default value (#21074)....

Jean-Philippe Lang -

r14391:e6112a9710cb

parent child

Context file:

r14391:e6112a9710cb

app/models/custom_value.rb +1 -1

               def initialize(attributes=nil, *args)
                 super
-                if new_record? && custom_field && (customized_type.blank? || (customized && customized.new_record?))
+                if new_record? && custom_field && !attributes.key?(:value)
                   self.value ||= custom_field.default_value
                 end
               end

lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb +2 -2

                         if field.multiple?
                           values = custom_values.select { |v| v.custom_field == field }
                           if values.empty?
-                            values << custom_values.build(:customized => self, :custom_field => field, :value => nil)
+                            values << custom_values.build(:customized => self, :custom_field => field)
                           end
                           x.value = values.map(&:value)
                         else
                           cv = custom_values.detect { |v| v.custom_field == field }
-                          cv ||= custom_values.build(:customized => self, :custom_field => field, :value => nil)
+                          cv ||= custom_values.build(:customized => self, :custom_field => field)
                           x.value = cv.value
                         end
                         x.value_was = x.value.dup if x.value

test/integration/api_test/issues_test.rb +2 -2

                 assert_equal "", issue.reload.custom_field_value(field)
               end
-              test "PUT /issues/:id.json with tracker change and omitted custom field specific to that tracker does not set default value" do
+              test "PUT /issues/:id.json with tracker change and omitted custom field specific to that tracker should set default value" do
                 field = IssueCustomField.generate!(:default_value => "Default", :tracker_ids => [2])
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1)
                 end
                 assert_equal 2, issue.reload.tracker_id
-                assert_nil issue.reload.custom_field_value(field)
+                assert_equal "Default", issue.reload.custom_field_value(field)
               end
               test "PUT /issues/:id.json with tracker change and custom field specific to that tracker set to blank should not set default value" do

test/unit/custom_value_test.rb +15 -5

@@ -20,15 +20,25 require File.expand_path('../../test_helper', __FILE__)
20	class CustomValueTest < ActiveSupport::TestCase	20	class CustomValueTest < ActiveSupport::TestCase
21	fixtures :custom_fields, :custom_values, :users	21	fixtures :custom_fields, :custom_values, :users
22		22
23	def test_default_value	23	def test_new_without_value_should_set_default_value
24	field = CustomField.~~find_by_default_value~~('Default string')	24	field = CustomField.generate!(:default_value => 'Default string')
25	assert_not_nil field
26		25
27	v = CustomValue.new(:custom_field => field)	26	v = CustomValue.new(:custom_field => field)
28	assert_equal 'Default string', v.value	27	assert_equal 'Default string', v.value
		28	end
		29
		30	def test_new_with_value_should_not_set_default_value
		31	field = CustomField.generate!(:default_value => 'Default string')
		32
		33	v = CustomValue.new(:custom_field => field, :value => 'String')
		34	assert_equal 'String', v.value
		35	end
		36
		37	def test_new_with_nil_value_should_not_set_default_value
		38	field = CustomField.generate!(:default_value => 'Default string')
29		39
30	v = CustomValue.new(:custom_field => field, :value => ~~'Not empty'~~)	40	v = CustomValue.new(:custom_field => field, :value => nil)
31	assert_~~equal~~ ~~'Not empty'~~, v.value	41	assert_nil v.value
32	end	42	end
33		43
34	def test_sti_polymorphic_association	44	def test_sti_polymorphic_association

General Comments 0

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

No TODOs yet

	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