1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-26 00:57:17 +00:00

Removes #move_to= (#12909).

git-svn-id: http://svn.redmine.org/redmine/trunk@15339 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-04-18 18:38:03 +00:00
parent db64340419
commit 39ff11ba06
4 changed files with 6 additions and 22 deletions

View File

@ -47,22 +47,6 @@ module Redmine
base.extend ClassMethods
end
# Move to the given position
# For compatibility with the previous way of sorting items
def move_to=(pos)
case pos.to_s
when 'highest'
self.position = 1
when 'higher'
self.position -= 1 if position > 1
when 'lower'
self.position += 1
when 'lowest'
self.position = nil
set_default_position
end
end
private
def position_scope

View File

@ -181,27 +181,27 @@ class RolesControllerTest < ActionController::TestCase
end
def test_move_highest
put :update, :id => 3, :role => {:move_to => 'highest'}
put :update, :id => 3, :role => {:position => 1}
assert_redirected_to '/roles'
assert_equal 1, Role.find(3).position
end
def test_move_higher
position = Role.find(3).position
put :update, :id => 3, :role => {:move_to => 'higher'}
put :update, :id => 3, :role => {:position => position - 1}
assert_redirected_to '/roles'
assert_equal position - 1, Role.find(3).position
end
def test_move_lower
position = Role.find(2).position
put :update, :id => 2, :role => {:move_to => 'lower'}
put :update, :id => 2, :role => {:position => position + 1}
assert_redirected_to '/roles'
assert_equal position + 1, Role.find(2).position
end
def test_move_lowest
put :update, :id => 2, :role => {:move_to => 'lowest'}
put :update, :id => 2, :role => {:position => Role.givable.count}
assert_redirected_to '/roles'
assert_equal Role.givable.count, Role.find(2).position
end

View File

@ -154,7 +154,7 @@ class EnumerationTest < ActiveSupport::TestCase
a = IssuePriority.create!(:name => 'A')
b = IssuePriority.create!(:name => 'B')
override = IssuePriority.create!(:name => 'BB', :parent_id => b.id)
b.move_to = 'higher'
b.position -= 1
b.save!
assert_equal [2, 1, 1], [a, b, override].map(&:reload).map(&:position)

View File

@ -82,7 +82,7 @@ class IssuePriorityTest < ActiveSupport::TestCase
def test_moving_a_priority_should_update_position_names
prio = IssuePriority.first
prio.move_to = 'lowest'
prio.position = IssuePriority.count
prio.save!
prio.reload
assert_equal 'highest', prio.position_name