From df59bff52f83e53d380b41483d0cfc8f7b23f959 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 30 Jul 2017 16:32:08 +0000 Subject: [PATCH] Merged r16918 and r16919 (#26564). git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16920 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/enumerations_controller.rb | 2 +- test/functional/enumerations_controller_test.rb | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb index 985e988bc..e5e3cc3de 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -105,6 +105,6 @@ class EnumerationsController < ApplicationController def enumeration_params # can't require enumeration on #new action - params.permit(:enumeration => [:name, :active, :is_default])[:enumeration] + params.permit(:enumeration => [:name, :active, :is_default, :position])[:enumeration] end end diff --git a/test/functional/enumerations_controller_test.rb b/test/functional/enumerations_controller_test.rb index 6b157a4e8..1e0b75fb5 100644 --- a/test/functional/enumerations_controller_test.rb +++ b/test/functional/enumerations_controller_test.rb @@ -124,6 +124,18 @@ class EnumerationsControllerTest < Redmine::ControllerTest assert_select_error /name cannot be blank/i end + def test_update_position + assert_equal 2, Enumeration.find(2).position + put :update, :params => { + :id => 2, + :enumeration => { + :position => 1, + } + } + assert_response 302 + assert_equal 1, Enumeration.find(2).position + end + def test_destroy_enumeration_not_in_use assert_difference 'IssuePriority.count', -1 do delete :destroy, :params => { -- 2.39.5