Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ff3caad4
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 搜索 >>
提交
ff3caad4
编写于
4月 10, 2015
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename manage_group ability to admin_group for consistency with project.
上级
ae6d0aaa
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
18 addition
and
18 deletion
+18
-18
app/controllers/groups/application_controller.rb
app/controllers/groups/application_controller.rb
+1
-1
app/controllers/groups/milestones_controller.rb
app/controllers/groups/milestones_controller.rb
+1
-1
app/models/ability.rb
app/models/ability.rb
+6
-6
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+1
-1
app/views/groups/group_members/index.html.haml
app/views/groups/group_members/index.html.haml
+1
-1
app/views/groups/milestones/_milestone.html.haml
app/views/groups/milestones/_milestone.html.haml
+1
-1
app/views/groups/milestones/show.html.haml
app/views/groups/milestones/show.html.haml
+1
-1
app/views/groups/projects.html.haml
app/views/groups/projects.html.haml
+1
-1
app/views/layouts/nav/_group.html.haml
app/views/layouts/nav/_group.html.haml
+1
-1
lib/api/group_members.rb
lib/api/group_members.rb
+3
-3
lib/api/groups.rb
lib/api/groups.rb
+1
-1
未找到文件。
app/controllers/groups/application_controller.rb
浏览文件 @
ff3caad4
...
...
@@ -13,7 +13,7 @@ class Groups::ApplicationController < ApplicationController
end
def
authorize_admin_group!
unless
can?
(
current_user
,
:
manage
_group
,
group
)
unless
can?
(
current_user
,
:
admin
_group
,
group
)
return
render_404
end
end
...
...
app/controllers/groups/milestones_controller.rb
浏览文件 @
ff3caad4
...
...
@@ -51,6 +51,6 @@ class Groups::MilestonesController < ApplicationController
end
def
authorize_group_milestone!
return
render_404
unless
can?
(
current_user
,
:
manage
_group
,
group
)
return
render_404
unless
can?
(
current_user
,
:
admin
_group
,
group
)
end
end
app/models/ability.rb
浏览文件 @
ff3caad4
...
...
@@ -198,11 +198,11 @@ class Ability
])
end
# Only group owner and administrators can
manage
group
# Only group owner and administrators can
admin
group
if
group
.
has_owner?
(
user
)
||
user
.
admin?
rules
.
push
(
*
[
:
manage
_group
,
:
manage
_namespace
:
admin
_group
,
:
admin
_namespace
])
end
...
...
@@ -212,11 +212,11 @@ class Ability
def
namespace_abilities
(
user
,
namespace
)
rules
=
[]
# Only namespace owner and administrators can
manage
it
# Only namespace owner and administrators can
admin
it
if
namespace
.
owner
==
user
||
user
.
admin?
rules
.
push
(
*
[
:create_projects
,
:
manage
_namespace
:
admin
_namespace
])
end
...
...
@@ -254,7 +254,7 @@ class Ability
rules
=
[]
target_user
=
subject
.
user
group
=
subject
.
group
can_manage
=
group_abilities
(
user
,
group
).
include?
(
:
manage
_group
)
can_manage
=
group_abilities
(
user
,
group
).
include?
(
:
admin
_group
)
if
can_manage
&&
(
user
!=
target_user
)
rules
<<
:modify_group_member
rules
<<
:destroy_group_member
...
...
app/views/dashboard/groups/index.html.haml
浏览文件 @
ff3caad4
...
...
@@ -17,7 +17,7 @@
-
group
=
group_member
.
group
%li
.pull-right
-
if
can?
(
current_user
,
:
manage
_group
,
group
)
-
if
can?
(
current_user
,
:
admin
_group
,
group
)
=
link_to
edit_group_path
(
group
),
class:
"btn-sm btn btn-grouped"
do
%i
.fa.fa-cogs
Settings
...
...
app/views/groups/group_members/index.html.haml
浏览文件 @
ff3caad4
...
...
@@ -16,7 +16,7 @@
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Find existing member by name'
,
class:
'form-control search-text-input input-mn-300'
}
=
button_tag
'Search'
,
class:
'btn'
-
if
current_user
&&
current_user
.
can?
(
:
manage
_group
,
@group
)
-
if
current_user
&&
current_user
.
can?
(
:
admin
_group
,
@group
)
.pull-right
=
button_tag
class:
'btn btn-new js-toggle-button'
,
type:
'button'
do
Add members
...
...
app/views/groups/milestones/_milestone.html.haml
浏览文件 @
ff3caad4
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
dom_id
(
milestone
.
milestones
.
first
)
}
.pull-right
-
if
can?
(
current_user
,
:
manage
_group
,
@group
)
-
if
can?
(
current_user
,
:
admin
_group
,
@group
)
-
if
milestone
.
closed?
=
link_to
'Reopen Milestone'
,
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-sm btn-grouped btn-reopen"
-
else
...
...
app/views/groups/milestones/show.html.haml
浏览文件 @
ff3caad4
...
...
@@ -6,7 +6,7 @@
Open
Milestone
#{
@group_milestone
.
title
}
.pull-right
-
if
can?
(
current_user
,
:
manage
_group
,
@group
)
-
if
can?
(
current_user
,
:
admin
_group
,
@group
)
-
if
@group_milestone
.
active?
=
link_to
'Close Milestone'
,
group_milestone_path
(
@group
,
@group_milestone
.
safe_title
,
title:
@group_milestone
.
title
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-sm btn-close"
-
else
...
...
app/views/groups/projects.html.haml
浏览文件 @
ff3caad4
...
...
@@ -2,7 +2,7 @@
.panel-heading
%strong
=
@group
.
name
projects:
-
if
can?
current_user
,
:
manage
_group
,
@group
-
if
can?
current_user
,
:
admin
_group
,
@group
.panel-head-actions
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-sm btn-success"
do
%i
.fa.fa-plus
...
...
app/views/layouts/nav/_group.html.haml
浏览文件 @
ff3caad4
...
...
@@ -30,7 +30,7 @@
%span
Members
-
if
can?
(
current_user
,
:
manage
_group
,
@group
)
-
if
can?
(
current_user
,
:
admin
_group
,
@group
)
=
nav_link
(
html_options:
{
class:
"
#{
"active"
if
group_settings_page?
}
separate-item"
})
do
=
link_to
edit_group_path
(
@group
),
title:
'Settings'
,
class:
"tab no-highlight"
do
%i
.fa.fa-cogs
...
...
lib/api/group_members.rb
浏览文件 @
ff3caad4
...
...
@@ -24,7 +24,7 @@ module API
# POST /groups/:id/members
post
":id/members"
do
group
=
find_group
(
params
[
:id
])
authorize!
:
manage
_group
,
group
authorize!
:
admin
_group
,
group
required_attributes!
[
:user_id
,
:access_level
]
unless
validate_access_level?
(
params
[
:access_level
])
...
...
@@ -50,7 +50,7 @@ module API
# PUT /groups/:id/members/:user_id
put
':id/members/:user_id'
do
group
=
find_group
(
params
[
:id
])
authorize!
:
manage
_group
,
group
authorize!
:
admin
_group
,
group
required_attributes!
[
:access_level
]
group_member
=
group
.
group_members
.
find_by
(
user_id:
params
[
:user_id
])
...
...
@@ -74,7 +74,7 @@ module API
# DELETE /groups/:id/members/:user_id
delete
":id/members/:user_id"
do
group
=
find_group
(
params
[
:id
])
authorize!
:
manage
_group
,
group
authorize!
:
admin
_group
,
group
member
=
group
.
group_members
.
find_by
(
user_id:
params
[
:user_id
])
if
member
.
nil?
...
...
lib/api/groups.rb
浏览文件 @
ff3caad4
...
...
@@ -61,7 +61,7 @@ module API
# DELETE /groups/:id
delete
":id"
do
group
=
find_group
(
params
[
:id
])
authorize!
:
manage
_group
,
group
authorize!
:
admin
_group
,
group
group
.
destroy
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录