diff options
author | Robert Speicher <robert@gitlab.com> | 2016-07-08 04:59:40 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-07-08 04:59:40 +0000 |
commit | 5d0b06a038a205f52f73f4cfd2947799f12698d0 (patch) | |
tree | 7e2a9f398a896e25155983d342459dbdb486aba5 | |
parent | 0de617772dfeb9bdcf3770e9acf7421db5023058 (diff) | |
parent | be6c4fef40a937757a0e95ba758bf1b6da0155d7 (diff) | |
download | gitlab-ce-5d0b06a038a205f52f73f4cfd2947799f12698d0.tar.gz |
Merge branch '9127-link-report-to-profile' into 'master'
Link to the user's profile in the abuse reports
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
Fixes #9127
See merge request !5118
-rw-r--r-- | app/views/admin/abuse_reports/_abuse_report.html.haml | 4 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 5 | ||||
-rw-r--r-- | spec/features/admin/admin_abuse_reports_spec.rb | 30 |
3 files changed, 37 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 diff --git a/spec/features/admin/admin_abuse_reports_spec.rb b/spec/features/admin/admin_abuse_reports_spec.rb new file mode 100644 index 00000000000..16baf7e9516 --- /dev/null +++ b/spec/features/admin/admin_abuse_reports_spec.rb @@ -0,0 +1,30 @@ +require 'spec_helper' + +describe "Admin::AbuseReports", feature: true, js: true do + let(:user) { create(:user) } + + context 'as an admin' do + describe 'if a user has been reported for abuse' do + before do + create(:abuse_report, user: user) + login_as :admin + end + + describe 'in the abuse report view' do + it "should present a link to the user's profile" do + visit admin_abuse_reports_path + + expect(page).to have_link user.name, href: user_path(user) + end + end + + describe 'in the profile page of the user' do + it 'should show a link to the admin view of the user' do + visit user_path(user) + + expect(page).to have_link '', href: admin_user_path(user) + end + end + end + end +end |