Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9b66aa6e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
9b66aa6e
编写于
12月 19, 2016
作者:
T
Tiago Botelho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prevent empty pagination when list is not empty
上级
c7ee5742
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
21 addition
and
4 deletion
+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
未找到文件。
app/controllers/concerns/kaminari_pagination.rb
0 → 100644
浏览文件 @
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
浏览文件 @
9b66aa6e
class
Dashboard::TodosController
<
Dashboard
::
ApplicationController
include
KaminariPagination
before_action
:find_todos
,
only:
[
:index
,
:destroy_all
]
def
index
@sort
=
params
[
:sort
]
@todos
=
@todos
.
page
(
params
[
:page
])
@todos
=
bounded_pagination
(
@todos
,
params
[
:page
])
end
def
destroy
...
...
app/controllers/projects/issues_controller.rb
浏览文件 @
9b66aa6e
...
...
@@ -5,6 +5,7 @@ class Projects::IssuesController < Projects::ApplicationController
include
ToggleAwardEmoji
include
IssuableCollections
include
SpammableActions
include
KaminariPagination
before_action
:redirect_to_external_issue_tracker
,
only:
[
:index
,
:new
]
before_action
:module_enabled
...
...
@@ -24,7 +25,7 @@ class Projects::IssuesController < Projects::ApplicationController
def
index
@issues
=
issues_collection
@issues
=
@issues
.
page
(
params
[
:page
])
@issues
=
bounded_pagination
(
@issues
,
params
[
:page
])
if
params
[
:label_name
].
present?
@labels
=
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
,
title:
params
[
:label_name
]).
execute
...
...
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
9b66aa6e
...
...
@@ -6,6 +6,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
include
NotesHelper
include
ToggleAwardEmoji
include
IssuableCollections
include
KaminariPagination
before_action
:module_enabled
before_action
:merge_request
,
only:
[
...
...
@@ -37,7 +38,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def
index
@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?
labels_params
=
{
project_id:
@project
.
id
,
title:
params
[
:label_name
]
}
...
...
app/controllers/projects/snippets_controller.rb
浏览文件 @
9b66aa6e
class
Projects::SnippetsController
<
Projects
::
ApplicationController
include
ToggleAwardEmoji
include
KaminariPagination
before_action
:module_enabled
before_action
:snippet
,
only:
[
:show
,
:edit
,
:destroy
,
:update
,
:raw
,
:toggle_award_emoji
]
...
...
@@ -25,7 +26,7 @@ class Projects::SnippetsController < Projects::ApplicationController
project:
@project
,
scope:
params
[
:scope
]
)
@snippets
=
@snippets
.
page
(
params
[
:page
])
@snippets
=
bounded_pagination
(
@snippets
,
params
[
:page
])
end
def
new
...
...
changelogs/unreleased/19988-prevent-empty-pagination-when-list-not-empty.yml
0 → 100644
浏览文件 @
9b66aa6e
---
title
:
Prevent empty pagination when list is not empty
merge_request
:
8172
author
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录