diff options
| author | André Lewin <andre.charles.lewin@gmail.com> | 2017-04-05 20:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 20:28:58 +0200 |
| commit | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch) | |
| tree | 45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /app/views/admin/reports/show.html.haml | |
| parent | 8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff) | |
| parent | d13d169922c7efeb6e6c20ef6a271eeda552275f (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/views/admin/reports/show.html.haml')
| -rw-r--r-- | app/views/admin/reports/show.html.haml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml index 74cac016d..caa8415df 100644 --- a/app/views/admin/reports/show.html.haml +++ b/app/views/admin/reports/show.html.haml @@ -27,7 +27,7 @@ = link_to remove_admin_report_path(@report, status_id: status.id), method: :post, class: 'icon-button', style: 'font-size: 24px; width: 24px; height: 24px', title: 'Delete' do = fa_icon 'trash' -- unless @report.action_taken? +- if !@report.action_taken? %hr/ %div{ style: 'overflow: hidden' } @@ -36,3 +36,9 @@ = link_to 'Suspend account', suspend_admin_report_path(@report), method: :post, class: 'button' %div{ style: 'float: left' } = link_to 'Mark as resolved', resolve_admin_report_path(@report), method: :post, class: 'button' +- elsif !@report.action_taken_by_account.nil? + %hr/ + + %p + %strong Action taken by: + = @report.action_taken_by_account.acct |