From 8aa8a88d938173dd3aa382d33c48d7e6063f1844 Mon Sep 17 00:00:00 2001 From: Seb Bacon Date: Wed, 24 Aug 2011 16:48:55 +0100 Subject: more work in progress on search forms --- app/controllers/general_controller.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/controllers/general_controller.rb') diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 4fa603aab..e9325c3c5 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -82,9 +82,12 @@ class GeneralController < ApplicationController # Just does a redirect from ?query= search to /query def search_redirect - @query = params[:query] + @query = alter_query_from_params @sortby = params[:sortby] @bodies = params[:bodies] + [:latest_status, :request_variety, :request_date_after, :request_date_before, :query].each do |x| + session[x] = params[x] + end if @query.nil? || @query.empty? @query = nil @page = 1 @@ -103,6 +106,9 @@ class GeneralController < ApplicationController def search # XXX Why is this so complicated with arrays and stuff? Look at the route # in config/routes.rb for comments. + [:latest_status, :request_variety, :request_date_after, :request_date_before, :query].each do |x| + params[x] = session[x] + end combined = params[:combined] @sortby = nil @bodies = false # searching from front page, largely for a public authority -- cgit v1.2.3