Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1a2e11c8
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,发现更多精彩内容 >>
未验证
提交
1a2e11c8
编写于
12月 25, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix per-project counters for Dashboard filters
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
f6a4e563
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
15 deletion
+9
-15
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+6
-12
app/views/shared/_filter.html.haml
app/views/shared/_filter.html.haml
+1
-1
features/steps/dashboard/dashboard_issues.rb
features/steps/dashboard/dashboard_issues.rb
+1
-1
features/steps/dashboard/dashboard_merge_requests.rb
features/steps/dashboard/dashboard_merge_requests.rb
+1
-1
未找到文件。
app/helpers/dashboard_helper.rb
浏览文件 @
1a2e11c8
...
@@ -14,17 +14,11 @@ module DashboardHelper
...
@@ -14,17 +14,11 @@ module DashboardHelper
end
end
def
entities_per_project
(
project
,
entity
)
def
entities_per_project
(
project
,
entity
)
items
=
project
.
items_for
(
entity
)
case
entity
.
to_sym
when
:issue
then
@issues
.
where
(
project_id:
project
.
id
)
items
=
case
params
[
:status
]
when
:merge_request
then
@merge_requests
.
where
(
target_project_id:
project
.
id
)
when
'closed'
else
items
.
closed
[]
when
'all'
end
.
count
items
else
items
.
opened
end
items
.
cared
(
current_user
).
count
end
end
end
end
app/views/shared/_filter.html.haml
浏览文件 @
1a2e11c8
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
Assigned to me
Assigned to me
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'authored'
)}
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'authored'
)}
=
link_to
filter_path
(
entity
,
scope:
'authored'
)
do
=
link_to
filter_path
(
entity
,
scope:
'authored'
)
do
Author
ed by me
Creat
ed by me
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'all'
)}
%li
{
class:
(
"active"
if
params
[
:scope
]
==
'all'
)}
=
link_to
filter_path
(
entity
,
scope:
'all'
)
do
=
link_to
filter_path
(
entity
,
scope:
'all'
)
do
All
All
...
...
features/steps/dashboard/dashboard_issues.rb
浏览文件 @
1a2e11c8
...
@@ -34,7 +34,7 @@ class DashboardIssues < Spinach::FeatureSteps
...
@@ -34,7 +34,7 @@ class DashboardIssues < Spinach::FeatureSteps
step
'I click "Authored by me" link'
do
step
'I click "Authored by me" link'
do
within
".scope-filter"
do
within
".scope-filter"
do
click_link
'
Author
ed by me'
click_link
'
Creat
ed by me'
end
end
end
end
...
...
features/steps/dashboard/dashboard_merge_requests.rb
浏览文件 @
1a2e11c8
...
@@ -34,7 +34,7 @@ class DashboardMergeRequests < Spinach::FeatureSteps
...
@@ -34,7 +34,7 @@ class DashboardMergeRequests < Spinach::FeatureSteps
step
'I click "Authored by me" link'
do
step
'I click "Authored by me" link'
do
within
".scope-filter"
do
within
".scope-filter"
do
click_link
'
Author
ed by me'
click_link
'
Creat
ed by me'
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录