meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

Merged r16918 and r16919 (#26564).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16920 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-07-30 16:32:08 +00:00
parent d378343c23
commit df59bff52f
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/enumerations_controller.rb
View File

@ -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

12
test/functional/enumerations_controller_test.rb
View File

@ -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 => {