diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-12-17 15:50:36 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-12-17 15:50:36 +0000 |
| commit | 9eb02d20ace73f74161c7f0b02ff2c6567cf5125 (patch) | |
| tree | 660ac27e702eee1224d10e24211e8dda972dc5a8 | |
| parent | 153984fd2e6841f3b0bc62e25e1718800a7c63ed (diff) | |
Limit pagination on similar pages in line with new upper limit on page offset.
| -rw-r--r-- | app/controllers/request_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/request/similar.rhtml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 5d950ceb2..970dfca45 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -153,6 +153,8 @@ class RequestController < ApplicationController end @xapian_object = ::ActsAsXapian::Similar.new([InfoRequestEvent], @info_request.info_request_events, :offset => (@page - 1) * @per_page, :limit => @per_page, :collapse_by_prefix => 'request_collapse') + @matches_estimated = @xapian_object.matches_estimated + @show_no_more_than = (@matches_estimated > MAX_RESULTS) ? MAX_RESULTS : @matches_estimated if (@page > 1) @page_desc = " (page " + @page.to_s + ")" diff --git a/app/views/request/similar.rhtml b/app/views/request/similar.rhtml index d9806aeb1..0d53f6919 100644 --- a/app/views/request/similar.rhtml +++ b/app/views/request/similar.rhtml @@ -20,4 +20,4 @@ <% end %> <% end %> -<%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_object.matches_estimated) %> +<%= will_paginate WillPaginate::Collection.new(@page, @per_page, @show_no_more_than) %> |