aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2011-09-07 22:14:36 +0200
committerDavid Cabo <david@calibea.com>2011-09-07 22:14:36 +0200
commita9002cc8e749df6f5961acab8e3e61fd21987fc1 (patch)
treef82b678847441cd7f05420b147022a21d43db3e6
parentc53bf71fcb9a646c206ab2a93473852cbeb56ffe (diff)
Hide Internal Admin from user, but using SQL conditions instead, fixes #173
-rw-r--r--app/controllers/public_body_controller.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index bcd7b334c..79ca58d13 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -91,7 +91,10 @@ class PublicBodyController < ApplicationController
@tag = params[:tag]
@locale = self.locale_from_params()
- locale_condition = "(upper(public_body_translations.name) LIKE upper(?) OR upper(public_body_translations.notes) LIKE upper (?)) AND public_body_translations.locale = ?"
+ locale_condition = "(upper(public_body_translations.name) LIKE upper(?)
+ OR upper(public_body_translations.notes) LIKE upper (?))
+ AND public_body_translations.locale = ?
+ AND public_bodies.id <> #{PublicBody.internal_admin_body.id}"
if @tag.nil? or @tag == "all"
@tag = "all"
conditions = [locale_condition, @query, @query, @locale]
@@ -129,7 +132,6 @@ class PublicBodyController < ApplicationController
:conditions => conditions,
:joins => :translations
)
- @public_bodies.delete(PublicBody.internal_admin_body) # Don't show the Internal Admin body to the user
render :template => "public_body/list"
end
end