Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-27 23:00:50 +01:00
Code Issues Packages Projects Releases Activity

Merged r19588 and r19589 from trunk to 4.1-stable (#33085).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19590 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-03-20 02:35:40 +00:00
parent d9c4b9d2ec
commit 1d2ec423bb
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/enumerations_controller.rb
View File

@@ -109,7 +109,7 @@ class EnumerationsController < ApplicationController
def enumeration_params
# can't require enumeration on #new action
cf_ids = @enumeration.available_custom_fields.map{|c| c.id.to_s}
cf_ids = @enumeration.available_custom_fields.map {|c| c.multiple? ? {c.id.to_s => []} : c.id.to_s}
params.permit(:enumeration => [:name, :active, :is_default, :position, :custom_field_values => cf_ids])[:enumeration]
end
end

15
test/functional/enumerations_controller_test.rb
View File

@@ -84,6 +84,21 @@ class EnumerationsControllerTest < Redmine::ControllerTest
assert_equal "sample", Enumeration.find_by(:name => 'Sample').custom_field_values.last.value
end
def test_create_with_multiple_select_list_custom_fields
custom_field = IssuePriorityCustomField.generate!(:field_format => 'list', :multiple => true, :possible_values => ['1', '2', '3', '4'])
assert_difference 'IssuePriority.count' do
post :create, :params => {
:enumeration => {
:type => 'IssuePriority',
:name => 'Sample',
:custom_field_values => {custom_field.id.to_s => ['1', '2']}
}
}
end
assert_redirected_to '/enumerations'
assert_equal ['1', '2'].sort, Enumeration.find_by(:name => 'Sample').custom_field_values.last.value.sort
end
def test_create_with_failure
assert_no_difference 'IssuePriority.count' do
post :create, :params => {