diff options
| -rw-r--r-- | app/models/censor_rule.rb | 6 | ||||
| -rw-r--r-- | app/models/info_request.rb | 2 | ||||
| -rw-r--r-- | app/models/public_body.rb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb index f40ab6fbb..6eeef8482 100644 --- a/app/models/censor_rule.rb +++ b/app/models/censor_rule.rb @@ -33,9 +33,9 @@ class CensorRule < ActiveRecord::Base validate :require_valid_regexp, :if => proc{ |rule| rule.regexp? == true } validates_presence_of :text - named_scope :global, {:conditions => {:info_request_id => nil, - :user_id => nil, - :public_body_id => nil}} + scope :global, {:conditions => {:info_request_id => nil, + :user_id => nil, + :public_body_id => nil}} def require_user_request_or_public_body if self.info_request.nil? && self.user.nil? && self.public_body.nil? diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 3355b9443..07fe11665 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -51,7 +51,7 @@ class InfoRequest < ActiveRecord::Base has_tag_string - named_scope :visible, :conditions => {:prominence => "normal"} + scope :visible, :conditions => {:prominence => "normal"} # user described state (also update in info_request_event, admin_request/edit.rhtml) validate :must_be_valid_state diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 2792b8f59..9bd80a90a 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -43,7 +43,7 @@ class PublicBody < ActiveRecord::Base before_save :set_api_key, :set_default_publication_scheme # Every public body except for the internal admin one is visible - named_scope :visible, lambda { + scope :visible, lambda { { :conditions => "public_bodies.id <> #{PublicBody.internal_admin_body.id}" } |