diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-03-20 02:37:33 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-03-20 02:37:33 +0000 |
| commit | 6323ef26ff889615e87cc5732ec9e72f8f5a620b (patch) | |
| tree | 1a095a3dc0d9027bdb3ce8d522c328fbb4a7d0d2 /app | |
| parent | f9b5eeb1afe6fff3c1472f0986be675bd21f1058 (diff) | |
| download | redmine-6323ef26ff889615e87cc5732ec9e72f8f5a620b.tar.gz redmine-6323ef26ff889615e87cc5732ec9e72f8f5a620b.zip | |
Merged r19588 and r19589 from trunk to 4.0-stable (#33085).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19591 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/enumerations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb index a04d7b184..7a0ab0214 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -107,7 +107,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 |