Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
aea79b80
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,发现更多精彩内容 >>
未验证
提交
aea79b80
编写于
5月 28, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add ability rule for creating project in namespace
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
aca6be50
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
5 deletion
+15
-5
app/models/ability.rb
app/models/ability.rb
+8
-0
app/models/group.rb
app/models/group.rb
+5
-1
app/models/project.rb
app/models/project.rb
+0
-4
app/models/user.rb
app/models/user.rb
+2
-0
未找到文件。
app/models/ability.rb
浏览文件 @
aea79b80
...
...
@@ -188,6 +188,13 @@ class Ability
rules
<<
:read_group
end
# Only group masters and group owners can create new projects in group
if
group
.
has_master?
(
user
)
||
group
.
has_owner?
(
user
)
||
user
.
admin?
rules
+=
[
:create_projects
,
]
end
# Only group owner and administrators can manage group
if
group
.
has_owner?
(
user
)
||
user
.
admin?
rules
+=
[
...
...
@@ -205,6 +212,7 @@ class Ability
# Only namespace owner and administrators can manage it
if
namespace
.
owner
==
user
||
user
.
admin?
rules
+=
[
:create_projects
,
:manage_namespace
]
end
...
...
app/models/group.rb
浏览文件 @
aea79b80
...
...
@@ -26,7 +26,7 @@ class Group < Namespace
validates
:avatar
,
file_size:
{
maximum:
100
.
kilobytes
.
to_i
}
mount_uploader
:avatar
,
AttachmentUploader
def
self
.
accessible_to
(
user
)
accessible_ids
=
Project
.
accessible_to
(
user
).
pluck
(
:namespace_id
)
accessible_ids
+=
user
.
groups
.
pluck
(
:id
)
if
user
...
...
@@ -60,6 +60,10 @@ class Group < Namespace
owners
.
include?
(
user
)
end
def
has_master?
(
user
)
members
.
masters
.
where
(
user_id:
user
).
any?
end
def
last_owner?
(
user
)
has_owner?
(
user
)
&&
owners
.
size
==
1
end
...
...
app/models/project.rb
浏览文件 @
aea79b80
...
...
@@ -387,10 +387,6 @@ class Project < ActiveRecord::Base
end
end
def
transfer
(
new_namespace
)
ProjectTransferService
.
new
.
transfer
(
self
,
new_namespace
)
end
def
execute_hooks
(
data
,
hooks_scope
=
:push_hooks
)
hooks
.
send
(
hooks_scope
).
each
do
|
hook
|
hook
.
async_execute
(
data
)
...
...
app/models/user.rb
浏览文件 @
aea79b80
...
...
@@ -90,6 +90,8 @@ class User < ActiveRecord::Base
has_many
:users_groups
,
dependent: :destroy
has_many
:groups
,
through: :users_groups
has_many
:owned_groups
,
->
{
where
users_groups:
{
group_access:
UsersGroup
::
OWNER
}
},
through: :users_groups
,
source: :group
has_many
:masters_groups
,
->
{
where
users_groups:
{
group_access:
UsersGroup
::
MASTER
}
},
through: :users_groups
,
source: :group
# Projects
has_many
:groups_projects
,
through: :groups
,
source: :projects
has_many
:personal_projects
,
through: :namespace
,
source: :projects
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录