diff options
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/plugins/acts_as_list/lib/active_record/acts/list.rb b/lib/plugins/acts_as_list/lib/active_record/acts/list.rb index cd4658c59..9361a768c 100644 --- a/lib/plugins/acts_as_list/lib/active_record/acts/list.rb +++ b/lib/plugins/acts_as_list/lib/active_record/acts/list.rb @@ -177,17 +177,17 @@ module ActiveRecord # Return the next higher item in the list. def higher_item return nil unless in_list? - acts_as_list_class.find(:first, :conditions => + acts_as_list_class.where( "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}" - ) + ).first end # Return the next lower item in the list. def lower_item return nil unless in_list? - acts_as_list_class.find(:first, :conditions => + acts_as_list_class.where( "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}" - ) + ).first end # Test if this record is in a list diff --git a/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb b/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb index 7510462bd..3c09310f5 100644 --- a/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb +++ b/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb @@ -216,12 +216,12 @@ module ActiveRecord #:nodoc: has_many :versions, version_association_options do # finds earliest version of this record def earliest - @earliest ||= find(:first, :order => 'version') + @earliest ||= order('version').first end # find latest version of this record def latest - @latest ||= find(:first, :order => 'version desc') + @latest ||= order('version desc').first end end before_save :set_new_version diff --git a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb index 95d9494d4..7f0b23197 100644 --- a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb +++ b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb @@ -413,7 +413,7 @@ module CollectiveIdea #:nodoc: # on creation, set automatically lft and rgt to the end of the tree def set_default_left_and_right - highest_right_row = nested_set_scope(:order => "#{quoted_right_column_name} desc").find(:first, :limit => 1,:lock => true ) + highest_right_row = nested_set_scope(:order => "#{quoted_right_column_name} desc").limit(1).lock(true).first maxright = highest_right_row ? (highest_right_row[right_column_name] || 0) : 0 # adds the new node to the right of all existing nodes self[left_column_name] = maxright + 1 @@ -443,11 +443,11 @@ module CollectiveIdea #:nodoc: in_tenacious_transaction do reload_nested_set # select the rows in the model that extend past the deletion point and apply a lock - self.class.base_class.find(:all, - :select => "id", - :conditions => ["#{quoted_left_column_name} >= ?", left], - :lock => true - ) + self.class.base_class. + select("id"). + where("#{quoted_left_column_name} >= ?", left). + lock(true). + all if acts_as_nested_set_options[:dependent] == :destroy descendants.each do |model| |