Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
12982366
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,发现更多精彩内容 >>
提交
12982366
编写于
8月 30, 2017
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
enhance disabled group visibility options with links and instructions
上级
8a72203a
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
9 addition
and
4 deletion
+9
-4
app/helpers/visibility_level_helper.rb
app/helpers/visibility_level_helper.rb
+7
-2
spec/helpers/visibility_level_helper_spec.rb
spec/helpers/visibility_level_helper_spec.rb
+2
-2
未找到文件。
app/helpers/visibility_level_helper.rb
浏览文件 @
12982366
...
...
@@ -105,6 +105,7 @@ module VisibilityLevelHelper
def
disallowed_group_visibility_level_description
(
level
,
group
)
level_name
=
Gitlab
::
VisibilityLevel
.
level_name
(
level
).
downcase
reasons
=
[]
instructions
=
''
unless
group
.
visibility_level_allowed_by_projects?
(
level
)
reasons
<<
"it contains projects with higher visibility"
...
...
@@ -115,11 +116,15 @@ module VisibilityLevelHelper
end
unless
group
.
visibility_level_allowed_by_parent?
(
level
)
reasons
<<
"the visibility of its parent group is
#{
group
.
parent
.
visibility
}
"
parent_group
=
link_to
group
.
parent
.
name
,
group_path
(
group
.
parent
)
change_visiblity
=
link_to
'change the visibility'
,
edit_group_path
(
group
.
parent
)
reasons
<<
"the visibility of
#{
parent_group
}
is
#{
group
.
parent
.
visibility
}
"
instructions
<<
" To make this group
#{
level_name
}
, you must first
#{
change_visiblity
}
of the parent group."
end
reasons
=
reasons
.
any?
?
' because '
+
reasons
.
to_sentence
:
''
"This group cannot be
#{
level_name
}#{
reasons
}
.
"
"This group cannot be
#{
level_name
}#{
reasons
}
.
#{
instructions
}
"
.
html_safe
end
def
visibility_icon_description
(
form_model
)
...
...
spec/helpers/visibility_level_helper_spec.rb
浏览文件 @
12982366
...
...
@@ -132,8 +132,8 @@ describe VisibilityLevelHelper do
.
to
include
"it contains projects with higher visibility"
,
"it contains sub-groups with higher visibility"
expect
(
disallowed_visibility_level?
(
subgroup
,
Gitlab
::
VisibilityLevel
::
PUBLIC
)).
to
be_truthy
expect
(
disallowed_visibility_level_description
(
Gitlab
::
VisibilityLevel
::
PUBLIC
,
subgroup
))
.
to
include
"the visibility of
its parent group
is internal"
expect
(
strip_tags
disallowed_visibility_level_description
(
Gitlab
::
VisibilityLevel
::
PUBLIC
,
subgroup
))
.
to
include
"the visibility of
#{
group
.
name
}
is internal"
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录