diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/body_controller.rb | 12 | ||||
| -rw-r--r-- | app/helpers/link_to_helper.rb | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/body_controller.rb b/app/controllers/body_controller.rb index a557c0cfc..6ad713455 100644 --- a/app/controllers/body_controller.rb +++ b/app/controllers/body_controller.rb @@ -4,27 +4,27 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: body_controller.rb,v 1.5 2008-02-27 12:04:10 francis Exp $ +# $Id: body_controller.rb,v 1.6 2008-02-27 12:09:03 francis Exp $ class BodyController < ApplicationController # XXX tidy this up with better error messages, and a more standard infrastructure for the redirect to canonical URL def show @public_bodies = PublicBody.find(:all, - :conditions => [ "url_name = ?", params[:simple_short_name] ]) + :conditions => [ "url_name = ?", params[:url_name] ]) if @public_bodies.size > 1 - raise "Two bodies with the same URL name: " . params[:simple_short_name] + raise "Two bodies with the same URL name: " . params[:url_name] end # If none found, then search the history of short names, and do a redirect if @public_bodies.size == 0 @public_bodies = PublicBody.find(:all, - :conditions => [ "id in (select public_body_id from public_body_versions where url_name = ?)", params[:simple_short_name] ]) + :conditions => [ "id in (select public_body_id from public_body_versions where url_name = ?)", params[:url_name] ]) if @public_bodies.size > 1 - raise "Two bodies with the same historical URL name: " . params[:simple_short_name] + raise "Two bodies with the same historical URL name: " . params[:url_name] end if @public_bodies.size == 0 raise "None found" # XXX proper 404 end - redirect_to show_public_body_url(:simple_short_name => @public_bodies[0].url_name) + redirect_to show_public_body_url(:url_name => @public_bodies[0].url_name) end @public_body = @public_bodies[0] end diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 9fb26a4f1..dbf569f20 100644 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -5,7 +5,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: link_to_helper.rb,v 1.16 2008-02-27 12:04:10 francis Exp $ +# $Id: link_to_helper.rb,v 1.17 2008-02-27 12:09:03 francis Exp $ module LinkToHelper @@ -27,7 +27,7 @@ module LinkToHelper # Public bodies def public_body_url(public_body) - return show_public_body_url(:simple_short_name => public_body.url_name, :only_path => true) + return show_public_body_url(:url_name => public_body.url_name, :only_path => true) end def public_body_link_short(public_body) link_to h(public_body.short_or_long_name), public_body_url(public_body) |