Merge pull request #104 from csaura/fix-top-position

Fix top position when position is lower than top position
brendon · Feb 22, 2014 · 3ebaffc · 3ebaffc
2 parents 332d2d7 + 475307d
commit 3ebaffc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/acts_as_list/active_record/acts/list.rb b/lib/acts_as_list/active_record/acts/list.rb
@@ -112,6 +112,7 @@ def add_new_at
             after_destroy :decrement_positions_on_lower_items
             before_update :check_scope
             after_update :update_positions
+            before_validation :check_top_position
 
             scope :in_list, lambda { where("#{table_name}.#{configuration[:column]} IS NOT NULL") }
           EOV
@@ -441,6 +442,12 @@ def check_scope
           def reload_position
             self.reload
           end
+
+          def check_top_position
+            if send(position_column) && send(position_column) < acts_as_list_top
+              self[position_column] = acts_as_list_top
+            end
+          end
       end
     end
   end

diff --git a/test/shared_zero_based.rb b/test/shared_zero_based.rb
@@ -24,6 +24,11 @@ def test_insert
       assert_equal 0, new.pos
       assert new.first?
       assert new.last?
+
+      new = ZeroBasedMixin.create(parent_id: 1, pos: -500)
+      assert_equal 0, new.pos
+      assert new.first?
+      assert new.last?
     end
 
     def test_reordering