diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/general_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/public_body_controller.rb | 12 | ||||
| -rw-r--r-- | app/controllers/request_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index cb7f3b23d..cb64cb922 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -413,10 +413,10 @@ class ApplicationController < ActionController::Base def get_date_range_from_params query = "" if param_exists(:request_date_after) && !param_exists(:request_date_before) - params[:request_date_before] = Date.now.strftime("%d/%m/%Y") + params[:request_date_before] = Time.now.strftime("%d/%m/%Y") query += " #{params[:request_date_after]}..#{params[:request_date_before]}" elsif !param_exists(:request_date_after) && param_exists(:request_date_before) - params[:request_date_after] = "01/01/2008" + params[:request_date_after] = "01/01/2001" end if param_exists(:request_date_after) query = " #{params[:request_date_after]}..#{params[:request_date_before]}" diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 2d0527d3a..40c79cdb8 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -139,7 +139,6 @@ class GeneralController < ApplicationController @sort_postfix = combined.pop @sortby = @sort_postfix end - if combined.size > 0 && (['bodies', 'requests', 'users', 'all'].include?(combined[-1])) @variety_postfix = combined.pop case @variety_postfix diff --git a/app/controllers/public_body_controller.rb b/app/controllers/public_body_controller.rb index d7d8c2c56..830f37855 100644 --- a/app/controllers/public_body_controller.rb +++ b/app/controllers/public_body_controller.rb @@ -90,27 +90,27 @@ class PublicBodyController < ApplicationController @query = "%#{params[:public_body_query].nil? ? "" : params[:public_body_query]}%" @tag = params[:tag] @locale = self.locale_from_params() - locale_condition = "upper(public_body_translations.name) LIKE upper(?) AND public_body_translations.locale = ?" + locale_condition = "(upper(public_body_translations.name) LIKE upper(?) OR upper(public_body_translations.notes) LIKE upper (?)) AND public_body_translations.locale = ?" if @tag.nil? or @tag == "all" @tag = "all" - conditions = [locale_condition, @query, @locale] + conditions = [locale_condition, @query, @query, @locale] elsif @tag == 'other' category_list = PublicBodyCategories::CATEGORIES.map{|c| "'"+c+"'"}.join(",") conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name in (' + category_list + ')) = 0', @query, @locale] + and has_tag_string_tags.name in (' + category_list + ')) = 0', @query, @query, @locale] elsif @tag.size == 1 @tag.upcase! - conditions = [locale_condition + ' AND public_body_translations.first_letter = ?', @query, @locale, @tag] + conditions = [locale_condition + ' AND public_body_translations.first_letter = ?', @query, @query, @locale, @tag] elsif @tag.include?(":") name, value = HasTagString::HasTagStringTag.split_tag_into_name_value(@tag) conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name = ? and has_tag_string_tags.value = ?) > 0', @query, @locale, name, value] + and has_tag_string_tags.name = ? and has_tag_string_tags.value = ?) > 0', @query, @query, @locale, name, value] else conditions = [locale_condition + ' AND (select count(*) from has_tag_string_tags where has_tag_string_tags.model_id = public_bodies.id and has_tag_string_tags.model = \'PublicBody\' - and has_tag_string_tags.name = ?) > 0', @query, @locale, @tag] + and has_tag_string_tags.name = ?) > 0', @query, @query, @locale, @tag] end if @tag.size == 1 @description = _("beginning with") + " '" + @tag + "'" diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 3c283baae..79b8e4816 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -134,6 +134,7 @@ class RequestController < ApplicationController @title = "View and search requests" sortby = "newest" @page = get_search_page_from_params if !@page # used in cache case, as perform_search sets @page as side effect + behavior_cache :tag => [@view, @page] do xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse') @list_results = xapian_object.results.map { |r| r[:model] } diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index 95ce217ba..15e00b85e 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -164,7 +164,7 @@ <% if @xapian_requests_hits == 1 && @page == 1 %> <h1><%= _("One FOI request matching your search", :user_search_query => h(@query)) %></h1> <% else %> - <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> + <h1><%= _("FOI requests {{start_count}} to {{end_count}} of {{total_count}}", :start_count => ((@page-1)*@requests_per_page+1).to_s, :end_count => [@page*@requests_per_page, @xapian_requests.matches_estimated].min.to_s, :total_count => @xapian_requests.matches_estimated.to_s, :user_search_query => h(@query)) %></h1> <% end %> <% if @track_thing %> |