diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-02-14 20:46:10 +0000 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-02-14 20:46:10 +0000 |
commit | 7d037e56eea7c67acac5a8afca2ba9a33cb6d2c2 (patch) | |
tree | 35ca8c465fa2560d5807501e219ca513581e762f /app/controllers/public_body_controller.rb | |
parent | 3fab39a758d1320747f8f04a5fef2e0370eac17b (diff) | |
parent | 87beeb16db6e76bb28cc13e5382a81a8103c5cc8 (diff) |
Merge remote-tracking branch 'openaustralia_github/fix-issue-789' into develop
Diffstat (limited to 'app/controllers/public_body_controller.rb')
-rw-r--r-- | app/controllers/public_body_controller.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index 8a4a65820..1bcc0145c 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -25,7 +25,7 @@ class PublicBodyController < ApplicationController end # If found by historic name, or alternate locale name, redirect to new name if @public_body.url_name != params[:url_name] - redirect_to show_public_body_url(:url_name => @public_body.url_name) + redirect_to :url_name => @public_body.url_name return end @@ -38,9 +38,7 @@ class PublicBodyController < ApplicationController @searched_to_send_request = true end @view = params[:view] - params[:latest_status] = @view - - query = make_query_from_params + query = make_query_from_params(params.merge(:latest_status => @view)) query += " requested_from:#{@public_body.url_name}" # Use search query for this so can collapse and paginate easily # XXX really should just use SQL query here rather than Xapian. |