Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d413f8e4
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,发现更多精彩内容 >>
提交
d413f8e4
编写于
8月 15, 2017
作者:
R
Rubén Dávila
提交者:
Mike Greiling
8月 26, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add validation for visibility level of sub groups
Sub groups should not have a visibility level higher than its parent.
上级
a30257c0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
0 deletion
+42
-0
app/models/group.rb
app/models/group.rb
+9
-0
spec/models/group_spec.rb
spec/models/group_spec.rb
+33
-0
未找到文件。
app/models/group.rb
浏览文件 @
d413f8e4
...
...
@@ -26,6 +26,7 @@ class Group < Namespace
validate
:avatar_type
,
if:
->
(
user
)
{
user
.
avatar
.
present?
&&
user
.
avatar_changed?
}
validate
:visibility_level_allowed_by_projects
validate
:visibility_level_allowed_by_parent
validates
:avatar
,
file_size:
{
maximum:
200
.
kilobytes
.
to_i
}
...
...
@@ -102,6 +103,14 @@ class Group < Namespace
full_name
end
def
visibility_level_allowed_by_parent
return
if
parent_id
.
blank?
if
parent
&&
(
visibility_level
>
parent
.
visibility_level
)
errors
.
add
(
:visibility_level
,
"
#{
visibility
}
is not allowed since the parent group has a
#{
parent
.
visibility
}
visibility."
)
end
end
def
visibility_level_allowed_by_projects
allowed_by_projects
=
self
.
projects
.
where
(
'visibility_level > ?'
,
self
.
visibility_level
).
none?
...
...
spec/models/group_spec.rb
浏览文件 @
d413f8e4
...
...
@@ -84,6 +84,39 @@ describe Group do
expect
(
group
).
not_to
be_valid
end
end
describe
'#visibility_level_allowed_by_parent'
do
let
(
:parent
)
{
create
(
:group
,
:internal
)
}
let
(
:sub_group
)
{
build
(
:group
,
parent_id:
parent
.
id
)
}
context
'without a parent'
do
it
'is valid'
do
sub_group
.
parent_id
=
nil
expect
(
sub_group
).
to
be_valid
end
end
context
'with a parent'
do
context
'when visibility of sub group is greater than the parent'
do
it
'is invalid'
do
sub_group
.
visibility_level
=
Gitlab
::
VisibilityLevel
::
PUBLIC
expect
(
sub_group
).
to
be_invalid
end
end
context
'when visibility of sub group is lower or equal to the parent'
do
[
Gitlab
::
VisibilityLevel
::
INTERNAL
,
Gitlab
::
VisibilityLevel
::
PRIVATE
].
each
do
|
level
|
it
'is valid'
do
sub_group
.
visibility_level
=
level
expect
(
sub_group
).
to
be_valid
end
end
end
end
end
end
describe
'.visible_to_user'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录