Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
9b66aa6e
Commit
9b66aa6e
authored
Dec 19, 2016
by
Tiago Botelho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent empty pagination when list is not empty
parent
c7ee5742
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
4 deletions
+21
-4
app/controllers/concerns/kaminari_pagination.rb
app/controllers/concerns/kaminari_pagination.rb
+8
-0
app/controllers/dashboard/todos_controller.rb
app/controllers/dashboard/todos_controller.rb
+3
-1
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+2
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-1
app/controllers/projects/snippets_controller.rb
app/controllers/projects/snippets_controller.rb
+2
-1
changelogs/unreleased/19988-prevent-empty-pagination-when-list-not-empty.yml
...ed/19988-prevent-empty-pagination-when-list-not-empty.yml
+4
-0
No files found.
app/controllers/concerns/kaminari_pagination.rb
0 → 100644
View file @
9b66aa6e
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
app/controllers/dashboard/todos_controller.rb
View file @
9b66aa6e
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
...
...
app/controllers/projects/issues_controller.rb
View file @
9b66aa6e
...
@@ -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
...
...
app/controllers/projects/merge_requests_controller.rb
View file @
9b66aa6e
...
@@ -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
]
}
...
...
app/controllers/projects/snippets_controller.rb
View file @
9b66aa6e
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
...
...
changelogs/unreleased/19988-prevent-empty-pagination-when-list-not-empty.yml
0 → 100644
View file @
9b66aa6e
---
title
:
Prevent empty pagination when list is not empty
merge_request
:
8172
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment