changeset 1123:48c5fdd6cf10 redmine-2.2-integration

Rails 3 compatibility: renamed all named_scope calls to scope.

--- a/plugins/redmine_bibliography/app/models/author.rb	Tue Jan 08 16:11:18 2013 +0000
+++ b/plugins/redmine_bibliography/app/models/author.rb	Tue Jan 08 16:19:01 2013 +0000
@@ -1,6 +1,6 @@
 class Author < ActiveRecord::Base
   unloadable
-  
+
   has_many :authorships, :dependent => :destroy
   has_many :publications, :through => :authorships
 
@@ -9,8 +9,8 @@
   def <=>(author)
     name.downcase <=> author.name.downcase
   end
-  
-  named_scope :like, lambda {|q| 
+
+  scope :like, lambda {|q|
     s = "%#{q.to_s.strip.downcase}%"
     {:conditions => ["LOWER(name) LIKE :s", {:s => s}],
      :order => 'name'

--- a/plugins/redmine_bibliography/app/models/authorship.rb	Tue Jan 08 16:11:18 2013 +0000
+++ b/plugins/redmine_bibliography/app/models/authorship.rb	Tue Jan 08 16:19:01 2013 +0000
@@ -1,18 +1,18 @@
 class Authorship < ActiveRecord::Base
-  unloadable 
-  
+  unloadable
+
   belongs_to :author
   belongs_to :publication
-  
+
   accepts_nested_attributes_for :author
   accepts_nested_attributes_for :publication
 
   validates_presence_of :name_on_paper
-  
+
   attr_accessor :is_user, :author_user_id, :search_name, :identify_author, :search_results
   before_save :associate_author_user
 
-  named_scope :like_unique, lambda {|q| 
+  scope :like_unique, lambda {|q|
     s = "%#{q.to_s.strip.downcase}%"
     {:conditions => ["LOWER(name_on_paper) LIKE :s OR LOWER(email) LIKE :s", {:s => s}],
      :order => 'name_on_paper',
@@ -20,27 +20,27 @@
     }
   }
 
-  named_scope :like, lambda {|q| 
+  scope :like, lambda {|q|
     s = "%#{q.to_s.strip.downcase}%"
     {:conditions => ["LOWER(name_on_paper) LIKE :s OR LOWER(email) LIKE :s", {:s => s}],
      :order => 'name_on_paper'
     }
   }
-  
+
   def name
     return self.name_on_paper
   end
-  
+
   def <=>(authorship)
     name.downcase <=> authorship.name.downcase
   end
-    
+
   def mail
     return self.email
   end
-  
-  protected 
-  def associate_author_user 
+
+  protected
+  def associate_author_user
     case self.identify_author
       when "no"
         author = Author.new
@@ -66,6 +66,6 @@
             self.author_id = object.author.id
           end
         end
-    end      
+    end
   end
 end

--- a/plugins/redmine_bibliography/lib/bibliography/project_publications_patch.rb	Tue Jan 08 16:11:18 2013 +0000
+++ b/plugins/redmine_bibliography/lib/bibliography/project_publications_patch.rb	Tue Jan 08 16:19:01 2013 +0000
@@ -5,8 +5,8 @@
     def self.included(base)
           base.class_eval do
             has_and_belongs_to_many :publications, :uniq => true
-          
-            named_scope :like, lambda {|q| 
+
+            scope :like, lambda {|q|
               s = "%#{q.to_s.strip.downcase}%"
               {:conditions => ["LOWER(name) LIKE :s OR LOWER(homepage) LIKE :s", {:s => s}],
                :order => 'name'
@@ -14,12 +14,12 @@
             }
           end
     end #self.included
-        
+
     module ProjectMethods
 
 
 
-    
+
     end #ProjectMethods
   end #ProjectPublicationsPatch
 end #RedmineBibliography
\ No newline at end of file