aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2011-09-26 13:12:15 +0200
committerDavid Cabo <david@calibea.com>2011-09-26 13:12:15 +0200
commitda6cb921342fdd57d5a7dee6a3beaa1dc2d543f2 (patch)
treedd5dfa71ae206b9261b1a8b841e616be5d87e3e0
parentd95fc384afd82a0ebeb7e4578ab738798bcea204 (diff)
Throw exception if body not found, 404 are handled on the ApplicationController
-rw-r--r--app/controllers/public_body_controller.rb12
1 files changed, 3 insertions, 9 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb
index ac75da068..251ab5efe 100644
--- a/app/controllers/public_body_controller.rb
+++ b/app/controllers/public_body_controller.rb
@@ -19,10 +19,7 @@ class PublicBodyController < ApplicationController
@locale = self.locale_from_params()
PublicBody.with_locale(@locale) do
@public_body = PublicBody.find_by_url_name_with_historic(params[:url_name])
- if @public_body.nil?
- render :template => 'public/404.html'
- return
- end
+ raise ActiveRecord::RecordNotFound.new("None found") if @public_body.nil?
if @public_body.url_name.nil?
redirect_to :back
return
@@ -73,11 +70,8 @@ class PublicBodyController < ApplicationController
def view_email
@public_body = PublicBody.find_by_url_name_with_historic(params[:url_name])
- if @public_body.nil?
- render :template => 'public/404.html'
- return
- end
-
+ raise ActiveRecord::RecordNotFound.new("None found") if @public_body.nil?
+
PublicBody.with_locale(self.locale_from_params()) do
if params[:submitted_view_email]
if verify_recaptcha