Don't hardcode id in acts_as_list. Closes #3370

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Michael Koziarski 2006-01-14 09:26:14 +00:00
parent 88dae72202
commit 62d749ab0e
2 changed files with 4 additions and 2 deletions

@ -1,8 +1,10 @@
*SVN* *SVN*
* Don't hardcode 'id' in acts as list. [ror@philippeapril.com]
* Fix date errors for SQLServer in association tests. #3406 [kevin.clark@gmal.com] * Fix date errors for SQLServer in association tests. #3406 [kevin.clark@gmal.com]
r Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp] * Escape database name in MySQL adapter when creating and dropping databases. #3409 [anna@wota.jp]
* Disambiguate table names for columns in validates_uniquness_of's WHERE clause. #3423 [alex.borovsky@gmail.com] * Disambiguate table names for columns in validates_uniquness_of's WHERE clause. #3423 [alex.borovsky@gmail.com]

@ -174,7 +174,7 @@ def bottom_position_in_list(except = nil)
def bottom_item(except = nil) def bottom_item(except = nil)
conditions = scope_condition conditions = scope_condition
conditions = "#{conditions} AND id != #{except.id}" if except conditions = "#{conditions} AND #{self.class.primary_key} != #{except.id}" if except
acts_as_list_class.find(:first, :conditions => conditions, :order => "#{position_column} DESC") acts_as_list_class.find(:first, :conditions => conditions, :order => "#{position_column} DESC")
end end