diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-10-26 07:09:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2019-10-26 07:09:52 +0000 |
| commit | 5a72c19e5dee8a775e5d79edf6e7a79590502342 (patch) | |
| tree | 2ad0e88c009bd838cf81640d059c36758100dddb /app/controllers | |
| parent | 49222d01fb5c8cd481ab9644813ca9b2db97245a (diff) | |
| download | redmine-5a72c19e5dee8a775e5d79edf6e7a79590502342.tar.gz redmine-5a72c19e5dee8a775e5d79edf6e7a79590502342.zip | |
Don't paginate the board view for now (#29482).
Subprojects may appear as root projects if their parents are on a previous page.
git-svn-id: http://svn.redmine.org/redmine/trunk@18866 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 2e4fc5303..c5c98d6fd 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -52,9 +52,14 @@ class ProjectsController < ApplicationController respond_to do |format| format.html { - @entry_count = scope.count - @entry_pages = Paginator.new @entry_count, per_page_option, params['page'] - @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).to_a + # TODO: see what to do with the board view and pagination + if @query.display_type == 'board' + @entries = scope.to_a + else + @entry_count = scope.count + @entry_pages = Paginator.new @entry_count, per_page_option, params['page'] + @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).to_a + end } format.api { @offset, @limit = api_offset_and_limit |