Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
197a5df4
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,发现更多精彩内容 >>
提交
197a5df4
编写于
7月 05, 2017
作者:
T
Tiago Botelho
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow admin to disable all restricted visibility levels
上级
81dba76b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
26 addition
and
5 deletion
+26
-5
app/controllers/admin/application_settings_controller.rb
app/controllers/admin/application_settings_controller.rb
+2
-0
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+4
-4
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+3
-1
changelogs/unreleased/32408-enable-disable-all-restricted-visibility-levels.yml
...32408-enable-disable-all-restricted-visibility-levels.yml
+4
-0
spec/features/admin/admin_settings_spec.rb
spec/features/admin/admin_settings_spec.rb
+13
-0
未找到文件。
app/controllers/admin/application_settings_controller.rb
浏览文件 @
197a5df4
...
...
@@ -71,6 +71,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
params
[
:application_setting
][
:disabled_oauth_sign_in_sources
]
=
AuthHelper
.
button_based_providers
.
map
(
&
:to_s
)
-
Array
(
enabled_oauth_sign_in_sources
)
params
[
:application_setting
][
:restricted_visibility_levels
]
&
.
delete
(
""
)
params
.
delete
(
:domain_blacklist_raw
)
if
params
[
:domain_blacklist_file
]
params
.
require
(
:application_setting
).
permit
(
...
...
app/helpers/application_settings_helper.rb
浏览文件 @
197a5df4
...
...
@@ -34,17 +34,17 @@ module ApplicationSettingsHelper
# Return a group of checkboxes that use Bootstrap's button plugin for a
# toggle button effect.
def
restricted_level_checkboxes
(
help_block_id
)
def
restricted_level_checkboxes
(
help_block_id
,
checkbox_name
)
Gitlab
::
VisibilityLevel
.
options
.
map
do
|
name
,
level
|
checked
=
restricted_visibility_levels
(
true
).
include?
(
level
)
css_class
=
checked
?
'active'
:
''
checkbox_name
=
"application_setting[restricted_visibility_levels][]
"
tag_name
=
"application_setting_visibility_level_
#{
level
}
"
label_tag
(
name
,
class:
css_class
)
do
label_tag
(
tag_
name
,
class:
css_class
)
do
check_box_tag
(
checkbox_name
,
level
,
checked
,
autocomplete:
'off'
,
'aria-describedby'
=>
help_block_id
,
id:
name
)
+
visibility_level_icon
(
level
)
+
name
id:
tag_
name
)
+
visibility_level_icon
(
level
)
+
name
end
end
end
...
...
app/views/admin/application_settings/_form.html.haml
浏览文件 @
197a5df4
...
...
@@ -22,7 +22,9 @@
.form-group
=
f
.
label
:restricted_visibility_levels
,
class:
'control-label col-sm-2'
.col-sm-10
-
restricted_level_checkboxes
(
'restricted-visibility-help'
).
each
do
|
level
|
-
checkbox_name
=
'application_setting[restricted_visibility_levels][]'
=
hidden_field_tag
(
checkbox_name
)
-
restricted_level_checkboxes
(
'restricted-visibility-help'
,
checkbox_name
).
each
do
|
level
|
.checkbox
=
level
%span
.help-block
#restricted-visibility-help
...
...
changelogs/unreleased/32408-enable-disable-all-restricted-visibility-levels.yml
0 → 100644
浏览文件 @
197a5df4
---
title
:
Allow admins to disable all restricted visibility levels
merge_request
:
12649
author
:
spec/features/admin/admin_settings_spec.rb
浏览文件 @
197a5df4
...
...
@@ -16,6 +16,19 @@ feature 'Admin updates settings', feature: true do
expect
(
page
).
to
have_content
"Application settings saved successfully"
end
scenario
'Uncheck all restricted visibility levels'
do
find
(
'#application_setting_visibility_level_0'
).
set
(
false
)
find
(
'#application_setting_visibility_level_10'
).
set
(
false
)
find
(
'#application_setting_visibility_level_20'
).
set
(
false
)
click_button
'Save'
expect
(
page
).
to
have_content
"Application settings saved successfully"
expect
(
find
(
'#application_setting_visibility_level_0'
)).
not_to
be_checked
expect
(
find
(
'#application_setting_visibility_level_10'
)).
not_to
be_checked
expect
(
find
(
'#application_setting_visibility_level_20'
)).
not_to
be_checked
end
scenario
'Change application settings'
do
uncheck
'Gravatar enabled'
fill_in
'Home page URL'
,
with:
'https://about.gitlab.com/'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录