From ea296a109a8655ea48c02c1d0a9bb0d19002d236 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 3 Dec 2012 21:30:10 +0000 Subject: Replaces find(:first/:all) calls. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10931 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/plugins') 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 3c09310f5..b63c891e4 100644 --- a/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb +++ b/lib/plugins/acts_as_versioned/lib/acts_as_versioned.rb @@ -248,14 +248,16 @@ module ActiveRecord #:nodoc: def self.reloadable? ; false ; end # find first version before the given version def self.before(version) - find :first, :order => 'version desc', - :conditions => ["#{original_class.versioned_foreign_key} = ? and version < ?", version.send(original_class.versioned_foreign_key), version.version] + order('version desc'). + where("#{original_class.versioned_foreign_key} = ? and version < ?", version.send(original_class.versioned_foreign_key), version.version). + first end # find first version after the given version. def self.after(version) - find :first, :order => 'version', - :conditions => ["#{original_class.versioned_foreign_key} = ? and version > ?", version.send(original_class.versioned_foreign_key), version.version] + order('version'). + where("#{original_class.versioned_foreign_key} = ? and version > ?", version.send(original_class.versioned_foreign_key), version.version). + first end def previous @@ -467,9 +469,9 @@ module ActiveRecord #:nodoc: # Finds versions of a specific model. Takes an options hash like find def find_versions(id, options = {}) - versioned_class.find :all, { + versioned_class.all({ :conditions => ["#{versioned_foreign_key} = ?", id], - :order => 'version' }.merge(options) + :order => 'version' }.merge(options)) end # Returns an array of columns that are versioned. See non_versioned_columns -- cgit v1.2.3