Commit 9b66aa6e authored by Tiago Botelho's avatar Tiago Botelho

Prevent empty pagination when list is not empty

parent c7ee5742
module KaminariPagination
extend ActiveSupport::Concern
def bounded_pagination(items, page_number)
items = items.page(page_number)
items.to_a.empty? ? items.page(items.total_pages) : items
end
end
class Dashboard::TodosController < Dashboard::ApplicationController class Dashboard::TodosController < Dashboard::ApplicationController
include KaminariPagination
before_action :find_todos, only: [:index, :destroy_all] before_action :find_todos, only: [:index, :destroy_all]
def index def index
@sort = params[:sort] @sort = params[:sort]
@todos = @todos.page(params[:page]) @todos = bounded_pagination(@todos, params[:page])
end end
def destroy def destroy
......
...@@ -5,6 +5,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -5,6 +5,7 @@ class Projects::IssuesController < Projects::ApplicationController
include ToggleAwardEmoji include ToggleAwardEmoji
include IssuableCollections include IssuableCollections
include SpammableActions include SpammableActions
include KaminariPagination
before_action :redirect_to_external_issue_tracker, only: [:index, :new] before_action :redirect_to_external_issue_tracker, only: [:index, :new]
before_action :module_enabled before_action :module_enabled
...@@ -24,7 +25,7 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -24,7 +25,7 @@ class Projects::IssuesController < Projects::ApplicationController
def index def index
@issues = issues_collection @issues = issues_collection
@issues = @issues.page(params[:page]) @issues = bounded_pagination(@issues, params[:page])
if params[:label_name].present? if params[:label_name].present?
@labels = LabelsFinder.new(current_user, project_id: @project.id, title: params[:label_name]).execute @labels = LabelsFinder.new(current_user, project_id: @project.id, title: params[:label_name]).execute
......
...@@ -6,6 +6,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -6,6 +6,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
include NotesHelper include NotesHelper
include ToggleAwardEmoji include ToggleAwardEmoji
include IssuableCollections include IssuableCollections
include KaminariPagination
before_action :module_enabled before_action :module_enabled
before_action :merge_request, only: [ before_action :merge_request, only: [
...@@ -37,7 +38,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -37,7 +38,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def index def index
@merge_requests = merge_requests_collection @merge_requests = merge_requests_collection
@merge_requests = @merge_requests.page(params[:page]) @merge_requests = bounded_pagination(@merge_requests, params[:page])
if params[:label_name].present? if params[:label_name].present?
labels_params = { project_id: @project.id, title: params[:label_name] } labels_params = { project_id: @project.id, title: params[:label_name] }
......
class Projects::SnippetsController < Projects::ApplicationController class Projects::SnippetsController < Projects::ApplicationController
include ToggleAwardEmoji include ToggleAwardEmoji
include KaminariPagination
before_action :module_enabled before_action :module_enabled
before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :toggle_award_emoji] before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :toggle_award_emoji]
...@@ -25,7 +26,7 @@ class Projects::SnippetsController < Projects::ApplicationController ...@@ -25,7 +26,7 @@ class Projects::SnippetsController < Projects::ApplicationController
project: @project, project: @project,
scope: params[:scope] scope: params[:scope]
) )
@snippets = @snippets.page(params[:page]) @snippets = bounded_pagination(@snippets, params[:page])
end end
def new def new
......
---
title: Prevent empty pagination when list is not empty
merge_request: 8172
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment