Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
32b579e8
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 搜索 >>
提交
32b579e8
编写于
8月 11, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Show member roles to all users on members page
上级
4c29c254
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
2 addition
and
84 deletion
+2
-84
CHANGELOG
CHANGELOG
+1
-0
app/helpers/members_helper.rb
app/helpers/members_helper.rb
+0
-6
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+1
-1
features/explore/groups.feature
features/explore/groups.feature
+0
-25
features/steps/explore/groups.rb
features/steps/explore/groups.rb
+0
-4
spec/helpers/members_helper_spec.rb
spec/helpers/members_helper_spec.rb
+0
-48
未找到文件。
CHANGELOG
浏览文件 @
32b579e8
...
...
@@ -22,6 +22,7 @@ v 8.11.0 (unreleased)
- Cache highlighted diff lines for merge requests
- Pre-create all builds for a Pipeline when the new Pipeline is created !5295
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
- Show member roles to all users on members page
- Fix awardable button mutuality loading spinners (ClemMakesApps)
- Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
- Optimize maximum user access level lookup in loading of notes
...
...
app/helpers/members_helper.rb
浏览文件 @
32b579e8
...
...
@@ -6,12 +6,6 @@ module MembersHelper
"
#{
action
}
_
#{
member
.
type
.
underscore
}
"
.
to_sym
end
def
default_show_roles
(
member
)
can?
(
current_user
,
action_member_permission
(
:update
,
member
),
member
)
||
can?
(
current_user
,
action_member_permission
(
:destroy
,
member
),
member
)
||
can?
(
current_user
,
action_member_permission
(
:admin
,
member
),
member
.
source
)
end
def
remove_member_message
(
member
,
user:
nil
)
user
=
current_user
if
defined?
(
current_user
)
...
...
app/views/shared/members/_member.html.haml
浏览文件 @
32b579e8
-
show_roles
=
local_assigns
.
fetch
(
:show_roles
,
default_show_roles
(
member
)
)
-
show_roles
=
local_assigns
.
fetch
(
:show_roles
,
true
)
-
show_controls
=
local_assigns
.
fetch
(
:show_controls
,
true
)
-
user
=
member
.
user
...
...
features/explore/groups.feature
浏览文件 @
32b579e8
...
...
@@ -24,14 +24,6 @@ Feature: Explore Groups
Then
I should see project
"Internal"
items
And
I should not see project
"Enterprise"
items
Scenario
:
I
should see group's members as user
Given
group
"TestGroup"
has internal project
"Internal"
And
"John Doe"
is owner of group
"TestGroup"
When
I sign in as a user
And
I visit group
"TestGroup"
members page
Then
I should see group member
"John Doe"
And
I should not see member roles
Scenario
:
I
should see group with private, internal and public projects as visitor
Given
group
"TestGroup"
has internal project
"Internal"
Given
group
"TestGroup"
has public project
"Community"
...
...
@@ -56,14 +48,6 @@ Feature: Explore Groups
And
I should not see project
"Internal"
items
And
I should not see project
"Enterprise"
items
Scenario
:
I
should see group's members as visitor
Given
group
"TestGroup"
has internal project
"Internal"
Given
group
"TestGroup"
has public project
"Community"
And
"John Doe"
is owner of group
"TestGroup"
When
I visit group
"TestGroup"
members page
Then
I should see group member
"John Doe"
And
I should not see member roles
Scenario
:
I
should see group with private, internal and public projects as user
Given
group
"TestGroup"
has internal project
"Internal"
Given
group
"TestGroup"
has public project
"Community"
...
...
@@ -91,15 +75,6 @@ Feature: Explore Groups
And
I should see project
"Internal"
items
And
I should not see project
"Enterprise"
items
Scenario
:
I
should see group's members as user
Given
group
"TestGroup"
has internal project
"Internal"
Given
group
"TestGroup"
has public project
"Community"
And
"John Doe"
is owner of group
"TestGroup"
When
I sign in as a user
And
I visit group
"TestGroup"
members page
Then
I should see group member
"John Doe"
And
I should not see member roles
Scenario
:
I
should see group with public project in public groups area
Given
group
"TestGroup"
has public project
"Community"
When
I visit the public groups area
...
...
features/steps/explore/groups.rb
浏览文件 @
32b579e8
...
...
@@ -62,10 +62,6 @@ class Spinach::Features::ExploreGroups < Spinach::FeatureSteps
expect
(
page
).
to
have_content
"John Doe"
end
step
'I should not see member roles'
do
expect
(
body
).
not_to
match
(
%r{owner|developer|reporter|guest}i
)
end
protected
def
group_has_project
(
groupname
,
projectname
,
visibility_level
)
...
...
spec/helpers/members_helper_spec.rb
浏览文件 @
32b579e8
...
...
@@ -9,54 +9,6 @@ describe MembersHelper do
it
{
expect
(
action_member_permission
(
:admin
,
group_member
)).
to
eq
:admin_group_member
}
end
describe
'#default_show_roles'
do
let
(
:user
)
{
double
}
let
(
:member
)
{
build
(
:project_member
)
}
before
do
allow
(
helper
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
:update_project_member
,
member
).
and_return
(
false
)
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
:destroy_project_member
,
member
).
and_return
(
false
)
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
:admin_project_member
,
member
.
source
).
and_return
(
false
)
end
context
'when the current cannot update, destroy or admin the passed member'
do
it
'returns false'
do
expect
(
helper
.
default_show_roles
(
member
)).
to
be_falsy
end
end
context
'when the current can update the passed member'
do
before
do
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
:update_project_member
,
member
).
and_return
(
true
)
end
it
'returns true'
do
expect
(
helper
.
default_show_roles
(
member
)).
to
be_truthy
end
end
context
'when the current can destroy the passed member'
do
before
do
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
:destroy_project_member
,
member
).
and_return
(
true
)
end
it
'returns true'
do
expect
(
helper
.
default_show_roles
(
member
)).
to
be_truthy
end
end
context
'when the current can admin the passed member source'
do
before
do
allow
(
helper
).
to
receive
(
:can?
).
with
(
user
,
:admin_project_member
,
member
.
source
).
and_return
(
true
)
end
it
'returns true'
do
expect
(
helper
.
default_show_roles
(
member
)).
to
be_truthy
end
end
end
describe
'#remove_member_message'
do
let
(
:requester
)
{
build
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录