Fix named_scope.

7 files changed, 24 insertions, 24 deletions

diff --git a/app/models/auth.rb b/app/models/auth.rb
index ca52bf6..11f0332 100644
--- a/app/models/auth.rb
+++ b/app/models/auth.rb
@@ -1,7 +1,7 @@
 class Auth < ActiveRecord::Base
   belongs_to :message 
 
-  #named_scope :hash, lambda {|hash| {
+  #scope :hash, lambda {|hash| {
   #  :joins => {:membership_messages => {:membership => :participant}},
   #  :order => "id ASC",
   #  :conditions => {:participants => {:id => participant.id}}}}
diff --git a/app/models/community.rb b/app/models/community.rb
index 2cd3298..3005aba 100644
--- a/app/models/community.rb
+++ b/app/models/community.rb
@@ -24,11 +24,11 @@ class Community < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name
 
-  named_scope :for_participant, lambda { |participant| {
+  scope :for_participant, lambda { |participant| {
     :joins => [:memberships => :participant],
     :conditions => { :participants => { :id => participant.id }}}}
 
-  named_scope :for_message, lambda { |message| {
+  scope :for_message, lambda { |message| {
     :joins => [:memberships => {:membership_messages => :message}],
     :conditions => { :messages => { :id => message.id }}}}
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 4885f8f..1a21133 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -28,11 +28,11 @@ class Event < ActiveRecord::Base
 private
 
   # if count <0 then list all events otherwise maximal count events
-  named_scope :for_participant, lambda { |participant_id,count| {
+  scope :for_participant, lambda { |participant_id,count| {
     :conditions => { :participant_id => participant_id },
     :order => "id ASC",
     count<0 ? :readonly : :limit => count }}
-  named_scope :for_participant_and_message_desc_order, lambda { |participant_id,message_id| {
+  scope :for_participant_and_message_desc_order, lambda { |participant_id,message_id| {
     :conditions => { :participant_id => participant_id, :message_id => message_id },
     :order => "id DESC",
     :limit => 1 }}
diff --git a/app/models/membership.rb b/app/models/membership.rb
index fda3093..0da7af5 100644
--- a/app/models/membership.rb
+++ b/app/models/membership.rb
@@ -30,20 +30,20 @@ class Membership < ActiveRecord::Base
 
   # returns memberships of the relation between a participant and a message
   # if no relationship then returns empty array.
-  named_scope :receiver, lambda { |participant_id,message_id| {
+  scope :receiver, lambda { |participant_id,message_id| {
     :joins => [:participant, {:membership_messages => :message}],
     :conditions => { :participants => { :id => participant_id }, :messages => { :id => message_id } } } }
 
-  named_scope :receivers, lambda { |message_id| {
+  scope :receivers, lambda { |message_id| {
     :joins => [:membership_messages => :message],
     :select => :memberships.to_s+".id" + ", community_id, participant_id",
     :conditions => { :messages => { :id => message_id } } } }
 
-  named_scope :for_participant_id, lambda { |participant_id| {
+  scope :for_participant_id, lambda { |participant_id| {
     :joins => [:participant],
     :conditions => { :participants => { :id => participant_id } } } }
 
-  named_scope :for_participant_id_and_community_id, lambda { |participant_id,community_id| {
+  scope :for_participant_id_and_community_id, lambda { |participant_id,community_id| {
     :joins => [:participant, :community],
     :conditions => { :participants => { :id => participant_id }, :communities => { :id => community_id } } } }
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 24eb296..26ba03f 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -29,26 +29,26 @@ class Message < ActiveRecord::Base
   has_one  :auth, :dependent => :destroy
   belongs_to :ressource
 
-  named_scope :for_participant_receiver, lambda {|participant| {
+  scope :for_participant_receiver, lambda {|participant| {
     :joins => {:membership_messages => {:membership => :participant}},
     :order => "id ASC",
     :conditions => {:participants => {:id => participant.id}},
     :readonly => false}}
 
-  named_scope :for_participant_sender, lambda {|participant| {
+  scope :for_participant_sender, lambda {|participant| {
     :order => "id ASC",
     :conditions => {:sender => participant.id},
     :readonly => false}}
 
-  named_scope :for_not_removed, lambda { {
+  scope :for_not_removed, lambda { {
     :order => "id ASC",
     :conditions => {:removed => false}}}
 
-  named_scope :for_removed, lambda { {
+  scope :for_removed, lambda { {
     :order => "id ASC",
     :conditions => {:removed => true}}}
 
-  named_scope :for_resource, lambda {|namespace, name| {
+  scope :for_resource, lambda {|namespace, name| {
     :joins => :ressource,
     :order => "id ASC",
     :conditions => {:ressources => {:namespace => namespace, :ressource => name}}}}
diff --git a/app/models/participant.rb b/app/models/participant.rb
index 3f32945..a1a00ef 100644
--- a/app/models/participant.rb
+++ b/app/models/participant.rb
@@ -42,19 +42,19 @@ class Participant < ActiveRecord::Base
   accepts_nested_attributes_for :communities, :reject_if => proc { |attrs| attrs.all? { |k, v| v.blank? } }
   accepts_nested_attributes_for :subparticipant, :allow_destroy => true
 
-  named_scope :order_id_asc, :order => "participants.id ASC"
-  named_scope :without_anonymous, :conditions => { :participants => { :anonymous => false } }
-  named_scope :anonymous, :conditions => { :participants => { :anonymous => true } }
-  named_scope :for_message, lambda { |message| {
+  scope :order_id_asc, :order => "participants.id ASC"
+  scope :without_anonymous, :conditions => { :participants => { :anonymous => false } }
+  scope :anonymous, :conditions => { :participants => { :anonymous => true } }
+  scope :for_message, lambda { |message| {
     :joins => [:memberships => {:membership_messages => :message}],
     :conditions => {:messages => {:id => message.id}}}}
-  named_scope :for_community, lambda { |community| {
+  scope :for_community, lambda { |community| {
     :joins => [:memberships => :community],
     :conditions => { :communities => { :id => community.id }}}}
-  named_scope :itsyou, lambda { |itsyoupid| { :conditions => { :participants => { :id => itsyoupid } } } }
-  named_scope :only_subparticipants, :conditions => { :participants => { :ptype => TYPE[:sub] } }
-  named_scope :only_mainparticipants, :conditions => { :participants => { :ptype => TYPE[:main] } }
-  named_scope :only_anonymous, :conditions => { :participants => { :ptype => TYPE[:anonym] } }
+  scope :itsyou, lambda { |itsyoupid| { :conditions => { :participants => { :id => itsyoupid } } } }
+  scope :only_subparticipants, :conditions => { :participants => { :ptype => TYPE[:sub] } }
+  scope :only_mainparticipants, :conditions => { :participants => { :ptype => TYPE[:main] } }
+  scope :only_anonymous, :conditions => { :participants => { :ptype => TYPE[:anonym] } }
 
   def self.reduced_attributes
     find  :all, :select => "participants.id, participants.name, participants.description, participants.email, participants.dns, participants.organization_id, participants.ptype"
diff --git a/app/models/ressource.rb b/app/models/ressource.rb
index 0a741dd..3419b42 100644
--- a/app/models/ressource.rb
+++ b/app/models/ressource.rb
@@ -22,7 +22,7 @@ class Ressource < ActiveRecord::Base
   after_save :rebuild_routes
   after_destroy :rebuild_routes
 
-  named_scope :list, :order => "namespace, ressource ASC"
+  scope :list, :order => "namespace, ressource ASC"
 
   def self.validates_ressource_path(namespace, ressource)
     r = Ressource.find_by_namespace_and_ressource(namespace, ressource)