Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f0644590
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,发现更多精彩内容 >>
提交
f0644590
编写于
11月 28, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2107 from AlexDenisov/projects_count_at_dashboard
Projects count at dashboard
上级
c873cf81
34c2d8e8
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
18 addition
and
1 deletion
+18
-1
app/models/project.rb
app/models/project.rb
+1
-0
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+1
-1
features/dashboard/dashboard.feature
features/dashboard/dashboard.feature
+6
-0
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+10
-0
未找到文件。
app/models/project.rb
浏览文件 @
f0644590
...
...
@@ -73,6 +73,7 @@ class Project < ActiveRecord::Base
scope
:public_only
,
where
(
private_flag:
false
)
scope
:without_user
,
->
(
user
)
{
where
(
"id NOT IN (:ids)"
,
ids:
user
.
projects
.
map
(
&
:id
)
)
}
scope
:not_in_group
,
->
(
group
)
{
where
(
"id NOT IN (:ids)"
,
ids:
group
.
project_ids
)
}
scope
:authorized_for
,
->
(
user
)
{
joins
(
:users_projects
)
{
where
(
user_id:
user
.
id
)
}
}
class
<<
self
def
active
...
...
app/views/dashboard/_groups.html.haml
浏览文件 @
f0644590
...
...
@@ -17,4 +17,4 @@
→
%span
.last_activity
%strong
Projects:
%span
=
group
.
projects
.
count
%span
=
group
.
projects
.
authorized_for
(
current_user
).
count
features/dashboard/dashboard.feature
浏览文件 @
f0644590
...
...
@@ -15,6 +15,12 @@ Feature: Dashboard
And
I visit dashboard page
Then
I should see groups list
Scenario
:
I
should see correct projects count
Given
I have group with projects
And
group has a projects that does not belongs to me
When
I visit dashboard page
Then
I should see 1 project at group list
Scenario
:
I
should see last push widget
Then
I should see last push widget
And
I click
"Create Merge Request"
link
...
...
features/steps/dashboard/dashboard.rb
浏览文件 @
f0644590
...
...
@@ -103,4 +103,14 @@ class Dashboard < Spinach::FeatureSteps
page
.
should
have_link
group
.
name
end
end
And
'group has a projects that does not belongs to me'
do
@forbidden_project1
=
create
(
:project
,
group:
@group
)
@forbidden_project2
=
create
(
:project
,
group:
@group
)
end
Then
'I should see 1 project at group list'
do
page
.
find
(
'span.last_activity/span'
).
should
have_content
(
'1'
)
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录