diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-07-06 11:48:06 -0500 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-07-06 11:48:06 -0500 |
commit | 5c4a2bff91e7ad02a675e5d0ce1c27a36bc4bee6 (patch) | |
tree | fa704c0de4d95b416614f0588afd7a2cf2d65dc1 /app/views | |
parent | 22780c4ac32a29347317a979c4b8bdf2913d34f7 (diff) | |
download | gitlab-ce-5c4a2bff91e7ad02a675e5d0ce1c27a36bc4bee6.tar.gz |
Link to the user's profile in the abuse reports and add a link to the admin area view if the user viewing the profile is an admin
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/abuse_reports/_abuse_report.html.haml | 4 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml index 862b86d9d4a..dd2e7ebd030 100644 --- a/app/views/admin/abuse_reports/_abuse_report.html.haml +++ b/app/views/admin/abuse_reports/_abuse_report.html.haml @@ -3,14 +3,14 @@ %tr %td - if user - = link_to user.name, [:admin, user] + = link_to user.name, user .light.small Joined #{time_ago_with_tooltip(user.created_at)} - else (removed) %td - if reporter - = link_to reporter.name, [:admin, reporter] + = link_to reporter.name, reporter - else (removed) .light.small diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 68665858c3e..db2b4885861 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -29,6 +29,11 @@ = link_to user_path(@user, :atom, { private_token: current_user.private_token }), class: 'btn btn-gray' do = icon('rss') + - if current_user.admin? + + = link_to [:admin, @user], class: 'btn btn-gray', title: 'View user in admin area', + data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do + = icon('users') .avatar-holder = link_to avatar_icon(@user, 400), target: '_blank' do |