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

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

Browse source
This commit is contained in:
Patricio Cano 2016-07-06 11:48:06 -05:00
parent 22780c4ac3
commit 5c4a2bff91
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/admin/abuse_reports/_abuse_report.html.haml
View file

@ -3,14 +3,14 @@
%tr %tr
%td %td
- if user - if user
= link_to user.name, [:admin, user] = link_to user.name, user
.light.small .light.small
Joined #{time_ago_with_tooltip(user.created_at)} Joined #{time_ago_with_tooltip(user.created_at)}
- else - else
(removed) (removed)
%td %td
- if reporter - if reporter
= link_to reporter.name, [:admin, reporter] = link_to reporter.name, reporter
- else - else
(removed) (removed)
.light.small .light.small

5
app/views/users/show.html.haml
View file

@ -29,6 +29,11 @@
   
= link_to user_path(@user, :atom, { private_token: current_user.private_token }), class: 'btn btn-gray' do = link_to user_path(@user, :atom, { private_token: current_user.private_token }), class: 'btn btn-gray' do
= icon('rss') = 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 .avatar-holder
= link_to avatar_icon(@user, 400), target: '_blank' do = link_to avatar_icon(@user, 400), target: '_blank' do