diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-11 07:09:22 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-11 07:09:22 -0800 |
| commit | 2c50252417bcf3ddd42d6f740feab17ef67ae0c5 (patch) | |
| tree | cefbf4099bc9eb0694520f04cc8485979b977297 | |
| parent | d88aafcb5d15827029a8f42e1a88ac313b1d218e (diff) | |
| parent | 34c8ca286aeeb6731d7b7d0cba3430564c2b2cd5 (diff) | |
| download | gitlab-ce-2c50252417bcf3ddd42d6f740feab17ef67ae0c5.tar.gz | |
Merge pull request #6025 from jvanbaarsen/fix-for-admin-user-edit
Fix for edit user as admin
| -rw-r--r-- | app/views/admin/users/_form.html.haml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index 4e8024a80cc..98bf65bc420 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -56,8 +56,12 @@ .form-group = f.label :admin, class: 'control-label' - .col-sm-10= f.check_box :admin - - unless @user.new_record? + - 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 + - unless @user.new_record? || current_user == @user .alert.alert-danger - if @user.blocked? %p This user is blocked and is not able to login to GitLab |