From 2eadcc3417b11237f9e40dd5eb5804b2fcc44c82 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 12 Feb 2013 12:53:30 +1100 Subject: Pass parameters to method rather explicitly --- app/controllers/request_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/request_controller.rb') diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index dfa3a4834..184441e06 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -175,7 +175,7 @@ class RequestController < ApplicationController end params[:latest_status] = @view - query = make_query_from_params + query = make_query_from_params(params) @title = _("View and search requests") sortby = "newest" xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') -- cgit v1.2.3 From 87beeb16db6e76bb28cc13e5382a81a8103c5cc8 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 12 Feb 2013 14:19:04 +1100 Subject: Don't pass latest_status param to locale switching links on view requests page --- app/controllers/request_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/controllers/request_controller.rb') diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 184441e06..6b8444f90 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -174,8 +174,7 @@ class RequestController < ApplicationController raise ActiveRecord::RecordNotFound.new("Sorry. No pages after #{MAX_RESULTS / PER_PAGE}.") end - params[:latest_status] = @view - query = make_query_from_params(params) + query = make_query_from_params(params.merge(:latest_status => @view)) @title = _("View and search requests") sortby = "newest" xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') -- cgit v1.2.3