Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1e64333c
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,发现更多精彩内容 >>
未验证
提交
1e64333c
编写于
12月 25, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor FilterContext
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
1a2e11c8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
34 deletion
+43
-34
app/contexts/filter_context.rb
app/contexts/filter_context.rb
+37
-10
app/controllers/dashboard_controller.rb
app/controllers/dashboard_controller.rb
+2
-20
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+4
-4
未找到文件。
app/contexts/filter_context.rb
浏览文件 @
1e64333c
class
FilterContext
attr_accessor
:
items
,
:params
attr_accessor
:
klass
,
:current_user
,
:params
def
initialize
(
items
,
params
)
@items
=
items
def
initialize
(
klass
,
current_user
,
params
)
@klass
=
klass
@current_user
=
current_user
@params
=
params
end
def
execute
apply_filter
(
items
)
items
=
by_scope
items
=
by_state
(
items
)
items
=
by_project
(
items
)
items
=
by_search
(
items
)
end
def
apply_filter
items
if
params
[
:project_id
].
present?
items
=
items
.
of_projects
(
params
[
:project_id
])
end
private
if
params
[
:search
].
present?
items
=
items
.
search
(
params
[
:search
])
def
by_scope
table_name
=
klass
.
table_name
case
params
[
:scope
]
when
'authored'
then
current_user
.
send
(
table_name
)
when
'all'
then
klass
.
of_projects
(
current_user
.
authorized_projects
.
pluck
(
:id
))
else
current_user
.
send
(
"assigned_
#{
table_name
}
"
)
end
end
def
by_state
(
items
)
case
params
[
:status
]
when
'closed'
items
.
closed
...
...
@@ -28,4 +39,20 @@ class FilterContext
items
.
opened
end
end
def
by_project
(
items
)
if
params
[
:project_id
].
present?
items
=
items
.
of_projects
(
params
[
:project_id
])
end
items
end
def
by_search
(
items
)
if
params
[
:search
].
present?
items
=
items
.
search
(
params
[
:search
])
end
items
end
end
app/controllers/dashboard_controller.rb
浏览文件 @
1e64333c
...
...
@@ -51,30 +51,12 @@ class DashboardController < ApplicationController
end
def
merge_requests
@merge_requests
=
case
params
[
:scope
]
when
'authored'
then
current_user
.
merge_requests
when
'all'
then
MergeRequest
.
where
(
target_project_id:
current_user
.
authorized_projects
.
pluck
(
:id
))
else
current_user
.
assigned_merge_requests
end
@merge_requests
=
FilterContext
.
new
(
@merge_requests
,
params
).
execute
@merge_requests
=
FilterContext
.
new
(
MergeRequest
,
current_user
,
params
).
execute
@merge_requests
=
@merge_requests
.
recent
.
page
(
params
[
:page
]).
per
(
20
)
end
def
issues
@issues
=
case
params
[
:scope
]
when
'authored'
then
current_user
.
issues
when
'all'
then
Issue
.
where
(
project_id:
current_user
.
authorized_projects
.
pluck
(
:id
))
else
current_user
.
assigned_issues
end
@issues
=
FilterContext
.
new
(
@issues
,
params
).
execute
@issues
=
FilterContext
.
new
(
Issue
,
current_user
,
params
).
execute
@issues
=
@issues
.
recent
.
page
(
params
[
:page
]).
per
(
20
)
@issues
=
@issues
.
includes
(
:author
,
:project
)
...
...
app/controllers/groups_controller.rb
浏览文件 @
1e64333c
...
...
@@ -45,15 +45,15 @@ class GroupsController < ApplicationController
# Get authored or assigned open merge requests
def
merge_requests
@merge_requests
=
current_user
.
cared_merge_requests
.
of_group
(
@group
)
@merge_requests
=
FilterContext
.
new
(
@merge_requests
,
params
).
execute
@merge_requests
=
FilterContext
.
new
(
MergeRequest
,
current_user
,
params
).
execute
@merge_requests
=
@merge_requests
.
of_group
(
@group
)
@merge_requests
=
@merge_requests
.
recent
.
page
(
params
[
:page
]).
per
(
20
)
end
# Get only assigned issues
def
issues
@issues
=
current_user
.
assigned_issues
.
of_group
(
@group
)
@issues
=
FilterContext
.
new
(
@issues
,
params
).
execute
@issues
=
FilterContext
.
new
(
Issue
,
current_user
,
params
).
execute
@issues
=
@issues
.
of_group
(
@group
)
@issues
=
@issues
.
recent
.
page
(
params
[
:page
]).
per
(
20
)
@issues
=
@issues
.
includes
(
:author
,
:project
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录