diff options
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 15 | ||||
| -rw-r--r-- | app/views/admin/users/_access_levels.html.haml | 18 | ||||
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 2 |
4 files changed, 29 insertions, 8 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index aa0f8d434dc..1cd50852e89 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -175,7 +175,7 @@ class Admin::UsersController < Admin::ApplicationController def user_params_ce [ - :admin, + :access_level, :avatar, :bio, :can_create_group, diff --git a/app/models/user.rb b/app/models/user.rb index 54f5388eb2c..79c83f7bcf4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 diff --git a/app/views/admin/users/_access_levels.html.haml b/app/views/admin/users/_access_levels.html.haml index 81337db3aae..18fdb1435a9 100644 --- a/app/views/admin/users/_access_levels.html.haml +++ b/app/views/admin/users/_access_levels.html.haml @@ -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' diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index a586f8d3184..c0807b8c507 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -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" - check "user_admin" + choose "user_access_level_admin" click_button "Save changes" end |