Commit 0ea38ed7 authored by jplang's avatar jplang

Ability to uncheck "Multiple values" for existing custom fields (#12251).

git-svn-id: https://svn.redmine.org/redmine/trunk@11167 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent d664b81f
...@@ -29,6 +29,7 @@ class CustomField < ActiveRecord::Base ...@@ -29,6 +29,7 @@ class CustomField < ActiveRecord::Base
validate :validate_custom_field validate :validate_custom_field
before_validation :set_searchable before_validation :set_searchable
after_save :handle_multiplicity_change
scope :sorted, lambda { order("#{table_name}.position ASC") } scope :sorted, lambda { order("#{table_name}.position ASC") }
...@@ -335,4 +336,20 @@ class CustomField < ActiveRecord::Base ...@@ -335,4 +336,20 @@ class CustomField < ActiveRecord::Base
end end
errs errs
end end
# Removes multiple values for the custom field after setting the multiple attribute to false
# We kepp the value with the highest id for each customized object
def handle_multiplicity_change
if !new_record? && multiple_was && !multiple
ids = custom_values.
where("EXISTS(SELECT 1 FROM #{CustomValue.table_name} cve WHERE cve.custom_field_id = #{CustomValue.table_name}.custom_field_id" +
" AND cve.customized_type = #{CustomValue.table_name}.customized_type AND cve.customized_id = #{CustomValue.table_name}.customized_id" +
" AND cve.id > #{CustomValue.table_name}.id)").
pluck(:id)
if ids.any?
custom_values.where(:id => ids).delete_all
end
end
end
end end
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p> <p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
<% if @custom_field.format_in? 'list', 'user', 'version' %> <% if @custom_field.format_in? 'list', 'user', 'version' %>
<p><%= f.check_box :multiple, :disabled => @custom_field.multiple && !@custom_field.new_record? %></p> <p><%= f.check_box :multiple %></p>
<% end %> <% end %>
<% unless @custom_field.format_in? 'list', 'bool', 'date', 'user', 'version' %> <% unless @custom_field.format_in? 'list', 'bool', 'date', 'user', 'version' %>
......
...@@ -209,6 +209,24 @@ class CustomFieldTest < ActiveSupport::TestCase ...@@ -209,6 +209,24 @@ class CustomFieldTest < ActiveSupport::TestCase
assert !f.valid_field_value?(['value1', 'abc']) assert !f.valid_field_value?(['value1', 'abc'])
end end
def test_changing_multiple_to_false_should_delete_multiple_values
field = ProjectCustomField.create!(:name => 'field', :field_format => 'list', :multiple => 'true', :possible_values => ['field1', 'field2'])
other = ProjectCustomField.create!(:name => 'other', :field_format => 'list', :multiple => 'true', :possible_values => ['other1', 'other2'])
item_with_multiple_values = Project.generate!(:custom_field_values => {field.id => ['field1', 'field2'], other.id => ['other1', 'other2']})
item_with_single_values = Project.generate!(:custom_field_values => {field.id => ['field1'], other.id => ['other2']})
assert_difference 'CustomValue.count', -1 do
field.multiple = false
field.save!
end
item_with_multiple_values = Project.find(item_with_multiple_values.id)
assert_kind_of String, item_with_multiple_values.custom_field_value(field)
assert_kind_of Array, item_with_multiple_values.custom_field_value(other)
assert_equal 2, item_with_multiple_values.custom_field_value(other).size
end
def test_value_class_should_return_the_class_used_for_fields_values def test_value_class_should_return_the_class_used_for_fields_values
assert_equal User, CustomField.new(:field_format => 'user').value_class assert_equal User, CustomField.new(:field_format => 'user').value_class
assert_equal Version, CustomField.new(:field_format => 'version').value_class assert_equal Version, CustomField.new(:field_format => 'version').value_class
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment