diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
| commit | 3b5d561700b184c20e63111d4cbc1daab78e16c6 (patch) | |
| tree | f0c53c6bf8d4ebf12e5388053ad856fb0d0e7b86 /templates/web/default/admin/update_edit.html | |
| parent | 390f8e8ad1e10f832c4323c39bed2c883744a03f (diff) | |
| parent | f38b8e985697c35a62374a2f02dce2d681ef58cd (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/User.pm
t/app/controller/admin.t
templates/web/default/admin/update_edit.html
web/css/core.css
Diffstat (limited to 'templates/web/default/admin/update_edit.html')
| -rw-r--r-- | templates/web/default/admin/update_edit.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html index 8746e62c4..e1783fd7c 100644 --- a/templates/web/default/admin/update_edit.html +++ b/templates/web/default/admin/update_edit.html @@ -36,6 +36,7 @@ [% ELSIF update.user.id == update.problem.user.id && update.mark_open %] <li>[% loc('Update reopened problem') %]</li> [% END %] +[% PROCESS abuse_button %] [% PROCESS flag_button user=update.user %]</li> <li>[% loc('Cobrand:') %] [% update.cobrand %]</li> <li>[% loc('Cobrand data:') %] [% update.cobrand_data %]</li> <li>[% loc('Created:') %] [% PROCESS format_time time=update.created %]</li> |