kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

CE port: Move EE differences for `app/views/admin/users/show.html.haml`

This commit is contained in:
Dennis Tang 2019-04-02 16:40:10 +00:00
parent f15caf0109
commit a3bbfbaeb7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/users/_user_detail.html.haml
View File

@ -6,7 +6,7 @@
= image_tag avatar_icon_for_user(user), class: 'avatar s16 d-xs-flex d-md-none mr-1 prepend-top-2', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) } = image_tag avatar_icon_for_user(user), class: 'avatar s16 d-xs-flex d-md-none mr-1 prepend-top-2', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) }
= link_to user.name, admin_user_path(user), class: 'text-plain js-user-link', data: { user_id: user.id } = link_to user.name, admin_user_path(user), class: 'text-plain js-user-link', data: { user_id: user.id }
= render_if_exists 'admin/users/user_detail_note', user: user = render_if_exists 'admin/users/user_listing_note', user: user
- user_badges_in_admin_section(user).each do |badge| - user_badges_in_admin_section(user).each do |badge|
- css_badge = "badge badge-#{badge[:variant]}" if badge[:variant].present? - css_badge = "badge badge-#{badge[:variant]}" if badge[:variant].present?

7
app/views/admin/users/show.html.haml
View File

@ -53,6 +53,8 @@
- else - else
Disabled Disabled
= render_if_exists 'admin/namespace_plan_info', namespace: @user.namespace
%li %li
%span.light External User: %span.light External User:
%strong %strong
@ -134,6 +136,8 @@
%strong %strong
= link_to @user.created_by.name, [:admin, @user.created_by] = link_to @user.created_by.name, [:admin, @user.created_by]
= render_if_exists partial: "namespaces/shared_runner_status", locals: { namespace: @user.namespace }
.col-md-6 .col-md-6
- unless @user == current_user - unless @user == current_user
- unless @user.confirmed? - unless @user.confirmed?
@ -146,6 +150,9 @@
%p This user has an unconfirmed email address#{email}. You may force a confirmation. %p This user has an unconfirmed email address#{email}. You may force a confirmation.
%br %br
= link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' } = link_to 'Confirm user', confirm_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' }
= render_if_exists 'admin/users/user_detail_note'
- if @user.blocked? - if @user.blocked?
.card.border-info .card.border-info
.card-header.bg-info.text-white .card-header.bg-info.text-white