diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-08-29 13:18:49 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-08-29 13:18:49 +0100 |
| commit | 9e6173961d2eefae7417ad2bca06e9168533405b (patch) | |
| tree | 18c3b8e9237d178e6a20c2412ac473685c9c183f | |
| parent | b41edc7ae069e6071f7ff7223c1e60cca5e75e8c (diff) | |
| parent | e8ff6d861faefb76c11475a112002cd1b0095590 (diff) | |
fix merge
| -rw-r--r-- | app/controllers/general_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/general/search.rhtml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 40c79cdb8..2d0527d3a 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -139,6 +139,7 @@ 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/views/general/search.rhtml b/app/views/general/search.rhtml index 15e00b85e..3e6a89582 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -164,7 +164,11 @@ <% if @xapian_requests_hits == 1 && @page == 1 %> <h1><%= _("One FOI request matching your search", :user_search_query => h(@query)) %></h1> <% else %> +<<<<<<< HEAD <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> +>>>>>>> e8ff6d861faefb76c11475a112002cd1b0095590 <% end %> <% if @track_thing %> |