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/general_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers/general_controller.rb') diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 875e39494..a8bbc22ff 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -151,10 +151,10 @@ class GeneralController < ApplicationController params[:query] = @query end if @variety_postfix != "all" && @requests - @query, _ = make_query_from_params + @query, _ = make_query_from_params(params) end @inputted_sortby = @sortby - @common_query = get_tags_from_params + @common_query = get_tags_from_params(params) if @sortby.nil? # Parse query, so can work out if it has prefix terms only - if so then it is a # structured query which should show newest first, rather than a free text search -- cgit v1.2.3 From f13808623671668a7f5e1fda2f2f2106d9699966 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 19 Feb 2013 13:02:48 +1100 Subject: Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into main project --- app/controllers/general_controller.rb | 6 +++++- 1 file changed, 5 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 a8bbc22ff..d34f75a72 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -230,6 +230,10 @@ class GeneralController < ApplicationController render(:layout => false, :content_type => 'text/css') end - + # For merged adminbootstraptheme + # TODO: Remove this ugly hack + def admin_js + render :layout => false, :content_type => "application/javascript" + end end -- cgit v1.2.3 From 8085e924a8888138a0c9127806888c438cf2600d Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 19 Feb 2013 14:27:47 +1100 Subject: Move serving of js for admin interface from general to admin_general controller --- app/controllers/general_controller.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'app/controllers/general_controller.rb') diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index d34f75a72..f6a46458e 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -229,11 +229,5 @@ class GeneralController < ApplicationController @locale = self.locale_from_params() render(:layout => false, :content_type => 'text/css') end - - # For merged adminbootstraptheme - # TODO: Remove this ugly hack - def admin_js - render :layout => false, :content_type => "application/javascript" - end end -- cgit v1.2.3