diff options
| author | Go MAEDA <maeda@farend.jp> | 2020-03-20 02:35:40 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2020-03-20 02:35:40 +0000 |
| commit | 1d2ec423bbf92c21426e1bc89cd2b3a5e6cab5ae (patch) | |
| tree | 8378ad449ae53a92fd37efb2423bf736359aef9e /app/controllers | |
| parent | d9c4b9d2ec12477b17a3b2f06a634f5f268b7c0e (diff) | |
| download | redmine-1d2ec423bbf92c21426e1bc89cd2b3a5e6cab5ae.tar.gz redmine-1d2ec423bbf92c21426e1bc89cd2b3a5e6cab5ae.zip | |
Merged r19588 and r19589 from trunk to 4.1-stable (#33085).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19590 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -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 ed5a0e636..a3d4e4756 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -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 |