Merge remote-tracking branch 'openaustralia_github/fix_count_inconsistencies' into develop

2 files changed, 8 insertions, 0 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index d8c84fa9e..74a67b9d9 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -51,6 +51,8 @@ class InfoRequest < ActiveRecord::Base
 
     has_tag_string
 
+    named_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 c70aff9b9..c3bc060a4 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -42,6 +42,12 @@ class PublicBody < ActiveRecord::Base
     has_tag_string
     before_save :set_api_key, :set_default_publication_scheme
 
+    # Every public body except for the internal admin one is visible
+    named_scope :visible, lambda {
+        {
+            :conditions => "public_bodies.id <> #{PublicBody.internal_admin_body.id}"
+        }
+    }
 
     translates :name, :short_name, :request_email, :url_name, :notes, :first_letter, :publication_scheme