Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6cad21ef
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,发现更多精彩内容 >>
提交
6cad21ef
编写于
8月 30, 2017
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
revert changes to visibility level helpers from
6f03ddcd
上级
b9b0b37b
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
10 addition
and
30 deletion
+10
-30
app/helpers/visibility_level_helper.rb
app/helpers/visibility_level_helper.rb
+5
-5
app/models/group.rb
app/models/group.rb
+3
-3
app/models/project.rb
app/models/project.rb
+2
-4
lib/gitlab/visibility_level.rb
lib/gitlab/visibility_level.rb
+0
-18
未找到文件。
app/helpers/visibility_level_helper.rb
浏览文件 @
6cad21ef
...
...
@@ -82,11 +82,11 @@ module VisibilityLevelHelper
reasons
=
[]
unless
project
.
visibility_level_allowed_as_fork?
(
level
)
reasons
<<
project
.
visibility_error_for
(
:fork
,
level:
level_name
)
reasons
<<
"the fork source project has lower visibility"
end
unless
project
.
visibility_level_allowed_by_group?
(
level
)
reasons
<<
project
.
visibility_error_for
(
:group
,
level:
level_name
,
group_level:
project
.
group
.
visibility
)
reasons
<<
"the visibility of
#{
project
.
group
.
name
}
is
#{
project
.
group
.
visibility
}
"
end
reasons
=
reasons
.
any?
?
' because '
+
reasons
.
to_sentence
:
''
...
...
@@ -98,15 +98,15 @@ module VisibilityLevelHelper
reasons
=
[]
unless
group
.
visibility_level_allowed_by_projects?
(
level
)
reasons
<<
group
.
visibility_error_for
(
:projects
,
level:
level_name
)
reasons
<<
"it contains projects with higher visibility"
end
unless
group
.
visibility_level_allowed_by_sub_groups?
(
level
)
reasons
<<
group
.
visibility_error_for
(
:sub_groups
,
level:
level_name
)
reasons
<<
"it contains sub-groups with higher visibility"
end
unless
group
.
visibility_level_allowed_by_parent?
(
level
)
reasons
<<
group
.
visibility_error_for
(
:parent
,
level:
level_name
,
parent_level:
group
.
parent
.
visibility
)
reasons
<<
"the visibility of its parent group is
#{
group
.
parent
.
visibility
}
"
end
reasons
=
reasons
.
any?
?
' because '
+
reasons
.
to_sentence
:
''
...
...
app/models/group.rb
浏览文件 @
6cad21ef
...
...
@@ -297,18 +297,18 @@ class Group < Namespace
def
visibility_level_allowed_by_parent
return
if
visibility_level_allowed_by_parent?
errors
.
add
(
:visibility_level
,
visibility_error_for
(
:parent
,
level:
visibility
,
parent_level:
parent
.
visibility
)
)
errors
.
add
(
:visibility_level
,
"
#{
visibility
}
is not allowed since the parent group has a
#{
parent
.
visibility
}
visibility."
)
end
def
visibility_level_allowed_by_projects
return
if
visibility_level_allowed_by_projects?
errors
.
add
(
:visibility_level
,
visibility_error_for
(
:projects
,
level:
visibility
)
)
errors
.
add
(
:visibility_level
,
"
#{
visibility
}
is not allowed since this group contains projects with higher visibility."
)
end
def
visibility_level_allowed_by_sub_groups
return
if
visibility_level_allowed_by_sub_groups?
errors
.
add
(
:visibility_level
,
visibility_error_for
(
:sub_groups
,
level:
visibility
)
)
errors
.
add
(
:visibility_level
,
"
#{
visibility
}
is not allowed since there are sub-groups with higher visibility."
)
end
end
app/models/project.rb
浏览文件 @
6cad21ef
...
...
@@ -671,16 +671,14 @@ class Project < ActiveRecord::Base
level_name
=
Gitlab
::
VisibilityLevel
.
level_name
(
self
.
visibility_level
).
downcase
group_level_name
=
Gitlab
::
VisibilityLevel
.
level_name
(
self
.
group
.
visibility_level
).
downcase
self
.
errors
.
add
(
:visibility_level
,
visibility_error_for
(
:group
,
level:
level_name
,
group_level:
group_level_name
))
self
.
errors
.
add
(
:visibility_level
,
"
#{
level_name
}
is not allowed in a
#{
group_level_name
}
group."
)
end
def
visibility_level_allowed_as_fork
return
if
visibility_level_allowed_as_fork?
level_name
=
Gitlab
::
VisibilityLevel
.
level_name
(
self
.
visibility_level
).
downcase
self
.
errors
.
add
(
:visibility_level
,
visibility_error_for
(
:fork
,
level:
level_name
))
self
.
errors
.
add
(
:visibility_level
,
"
#{
level_name
}
is not allowed since the fork source project has lower visibility."
)
end
def
check_wiki_path_conflict
...
...
lib/gitlab/visibility_level.rb
浏览文件 @
6cad21ef
...
...
@@ -130,23 +130,5 @@ module Gitlab
def
visibility
=
(
level
)
self
[
visibility_level_field
]
=
Gitlab
::
VisibilityLevel
.
level_value
(
level
)
end
def
visibility_errors_template
@visibility_errors
||=
{
'Project'
=>
{
group:
"%{level} is not allowed in a %{group_level} group"
,
fork:
"%{level} is not allowed since the fork source project has lower visibility"
},
'Group'
=>
{
parent:
"%{level} is not allowed since the parent group has a %{parent_level} visibility"
,
projects:
"%{level} is not allowed since this group contains projects with higher visibility"
,
sub_groups:
"%{level} is not allowed since there are sub-groups with higher visibility"
}
}
end
def
visibility_error_for
(
section
,
variables
)
visibility_errors_template
.
dig
(
model_name
.
to_s
,
section
)
%
variables
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录