Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
426680de
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,发现更多精彩内容 >>
提交
426680de
编写于
2月 06, 2017
作者:
J
Jose Ivan Vargas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Backport of the frontend view, including tests
上级
54ff60f7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
8 deletion
+29
-8
app/controllers/admin/users_controller.rb
app/controllers/admin/users_controller.rb
+1
-1
app/models/user.rb
app/models/user.rb
+15
-0
app/views/admin/users/_access_levels.html.haml
app/views/admin/users/_access_levels.html.haml
+12
-6
spec/features/admin/admin_users_spec.rb
spec/features/admin/admin_users_spec.rb
+1
-1
未找到文件。
app/controllers/admin/users_controller.rb
浏览文件 @
426680de
...
...
@@ -175,7 +175,7 @@ class Admin::UsersController < Admin::ApplicationController
def
user_params_ce
[
:a
dmin
,
:a
ccess_level
,
:avatar
,
:bio
,
:can_create_group
,
...
...
app/models/user.rb
浏览文件 @
426680de
...
...
@@ -903,6 +903,21 @@ class User < ActiveRecord::Base
end
end
def
access_level
if
admin?
:admin
else
:regular
end
end
def
access_level
=
(
new_level
)
new_level
=
new_level
.
to_s
return
unless
%w(admin regular)
.
include?
(
new_level
)
self
.
admin
=
(
new_level
==
'admin'
)
end
private
def
ci_projects_union
...
...
app/views/admin/users/_access_levels.html.haml
浏览文件 @
426680de
...
...
@@ -9,12 +9,18 @@
.col-sm-10
=
f
.
check_box
:can_create_group
.form-group
=
f
.
label
:admin
,
class:
'control-label'
-
if
current_user
==
@user
.col-sm-10
=
f
.
check_box
:admin
,
disabled:
true
.col-sm-10
You cannot remove your own admin rights.
-
else
.col-sm-10
=
f
.
check_box
:admin
=
f
.
label
:access_level
,
class:
'control-label'
.col-sm-10
=
f
.
radio_button
:access_level
,
:regular
,
disabled:
(
current_user
==
@user
&&
@user
.
is_admin?
)
=
label_tag
:regular
do
Regular
%p
.light
Regular users have access to their groups and projects
=
f
.
radio_button
:access_level
,
:admin
=
label_tag
:admin
do
Admin
%p
.light
Administrators have access to all groups, projects and users and can manage all features in this installation
.form-group
=
f
.
label
:external
,
class:
'control-label'
...
...
spec/features/admin/admin_users_spec.rb
浏览文件 @
426680de
...
...
@@ -211,7 +211,7 @@ describe "Admin::Users", feature: true do
fill_in
"user_email"
,
with:
"bigbang@mail.com"
fill_in
"user_password"
,
with:
"AValidPassword1"
fill_in
"user_password_confirmation"
,
with:
"AValidPassword1"
ch
eck
"user
_admin"
ch
oose
"user_access_level
_admin"
click_button
"Save changes"
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录