aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/App/Controller/Admin.pm13
-rw-r--r--perllib/FixMyStreet/App/Controller/Admin/Users.pm3
-rw-r--r--templates/web/base/admin/report_blocks.html4
-rw-r--r--templates/web/base/admin/report_edit.html2
-rw-r--r--templates/web/base/admin/update_edit.html2
-rw-r--r--templates/web/base/admin/users/edit.html2
-rw-r--r--templates/web/base/admin/users/import.html2
-rw-r--r--templates/web/zurich/admin/index-dm.html2
-rw-r--r--templates/web/zurich/admin/report_edit-sdm.html2
-rw-r--r--templates/web/zurich/admin/report_edit.html2
-rw-r--r--templates/web/zurich/admin/update_edit.html2
11 files changed, 18 insertions, 18 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 6167a16f5..d0d84ff70 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -484,15 +484,14 @@ sub report_edit : Path('report_edit') : Args(1) {
$problem->resend;
$problem->update();
- $c->stash->{status_message} =
- '<p><em>' . _('That problem will now be resent.') . '</em></p>';
+ $c->stash->{status_message} = _('That problem will now be resent.');
$c->forward( 'log_edit', [ $id, 'problem', 'resend' ] );
}
elsif ( $c->get_param('mark_sent') ) {
$c->forward('/auth/check_csrf_token');
$problem->update({ whensent => \'current_timestamp' })->discard_changes;
- $c->stash->{status_message} = '<p><em>' . _('That problem has been marked as sent.') . '</em></p>';
+ $c->stash->{status_message} = _('That problem has been marked as sent.');
$c->forward( 'log_edit', [ $id, 'problem', 'marked sent' ] );
}
elsif ( $c->get_param('flaguser') ) {
@@ -571,8 +570,7 @@ sub report_edit : Path('report_edit') : Args(1) {
}
$c->forward( 'log_edit', [ $id, 'problem', 'edit' ] );
- $c->stash->{status_message} =
- '<p><em>' . _('Updated!') . '</em></p>';
+ $c->stash->{status_message} = _('Updated!');
# do this here otherwise lastupdate and confirmed times
# do not display correctly
@@ -921,13 +919,12 @@ sub update_edit : Path('update_edit') : Args(1) {
$self->remove_photo($c, $update, $remove_photo_param);
}
- $c->stash->{status_message} = '<p><em>' . _('Updated!') . '</em></p>';
+ $c->stash->{status_message} = _('Updated!');
# Must call update->hide while it's not hidden (so is_latest works)
if ($new_state eq 'hidden') {
my $outcome = $update->hide;
- $c->stash->{status_message} .=
- '<p><em>' . _('Problem marked as open.') . '</em></p>'
+ $c->stash->{status_message} .= _('Problem marked as open.')
if $outcome->{reopened};
}
diff --git a/perllib/FixMyStreet/App/Controller/Admin/Users.pm b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
index 1a51df523..657bfafa9 100644
--- a/perllib/FixMyStreet/App/Controller/Admin/Users.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin/Users.pm
@@ -160,8 +160,7 @@ sub edit : Path : Args(1) {
$c->cobrand->call_hook('admin_user_edit_extra_data');
if ( defined $c->flash->{status_message} ) {
- $c->stash->{status_message} =
- '<p><em>' . $c->flash->{status_message} . '</em></p>';
+ $c->stash->{status_message} = $c->flash->{status_message};
}
$c->forward('/auth/check_csrf_token') if $c->get_param('submit');
diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html
index 4c52b14bb..4c679e3b8 100644
--- a/templates/web/base/admin/report_blocks.html
+++ b/templates/web/base/admin/report_blocks.html
@@ -47,3 +47,7 @@ SET state_groups = c.cobrand.state_groups_admin;
</span>
[% END %]
[% END %]
+
+[% BLOCK status_message %]
+ <p><em>[% status_message %]</em></p>
+[% END %]
diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html
index a26a35c50..e7d126558 100644
--- a/templates/web/base/admin/report_edit.html
+++ b/templates/web/base/admin/report_edit.html
@@ -116,7 +116,7 @@ class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a>
</ul>
</div>
-[% status_message %]
+[% INCLUDE status_message %]
<ul class="plain-list">
<li><label for='title'>[% loc('Subject:') %]</label>
diff --git a/templates/web/base/admin/update_edit.html b/templates/web/base/admin/update_edit.html
index fca9b1904..527b3f9f8 100644
--- a/templates/web/base/admin/update_edit.html
+++ b/templates/web/base/admin/update_edit.html
@@ -1,7 +1,7 @@
[% INCLUDE 'admin/header.html' title=tprintf(loc('Editing update %d'), update.id ) -%]
[% PROCESS 'admin/report_blocks.html' %]
-[% status_message %]
+[% INCLUDE status_message %]
<form method="post" action="[% c.uri_for( 'update_edit', update.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
<input type="hidden" name="token" value="[% csrf_token %]" >
diff --git a/templates/web/base/admin/users/edit.html b/templates/web/base/admin/users/edit.html
index 8dd2b926f..204e58607 100644
--- a/templates/web/base/admin/users/edit.html
+++ b/templates/web/base/admin/users/edit.html
@@ -6,7 +6,7 @@
[% INCLUDE 'admin/header.html' title=title -%]
[% PROCESS 'admin/report_blocks.html' %]
-[% status_message %]
+[% INCLUDE status_message %]
[% INCLUDE 'admin/users/form.html' %]
diff --git a/templates/web/base/admin/users/import.html b/templates/web/base/admin/users/import.html
index 0c0b903d7..a885a3ac3 100644
--- a/templates/web/base/admin/users/import.html
+++ b/templates/web/base/admin/users/import.html
@@ -1,7 +1,7 @@
[% INCLUDE 'admin/header.html' title=loc("User Import") -%]
[% PROCESS 'admin/report_blocks.html' %]
-[% status_message %]
+[% INCLUDE status_message %]
<form method="post" id="user_edit" enctype="multipart/form-data" accept-charset="utf-8">
<input type="hidden" name="token" value="[% csrf_token %]" >
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html
index 4d77cf264..c93adbfb3 100644
--- a/templates/web/zurich/admin/index-dm.html
+++ b/templates/web/zurich/admin/index-dm.html
@@ -1,7 +1,7 @@
[% PROCESS 'admin/header.html' title=loc('Summary') -%]
[% PROCESS 'admin/report_blocks.html' %]
-[% status_message %]
+[% INCLUDE status_message %]
<h2 id="submitted">[% loc('Submitted') %]</h2>
[% INCLUDE list, problems = submitted.all, hash = 'submitted' %]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index e6b17b8f0..b9fb6ff4d 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -79,7 +79,7 @@
<dd>[% problem.get_time_spent %]</dd>
<dd>
- [% status_message %]
+ [% INCLUDE status_message %]
</dd>
[% IF problem.photo %]
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/report_edit.html
index d6f9c4c39..0186a6286 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/report_edit.html
@@ -129,7 +129,7 @@
<div class="admin-report-edit admin-report-edit--interact">
-[% status_message %]
+[% INCLUDE status_message %]
<dl [% IF status_message %]class="with-message"[% END %]>
diff --git a/templates/web/zurich/admin/update_edit.html b/templates/web/zurich/admin/update_edit.html
index bcf849732..314ae3e2b 100644
--- a/templates/web/zurich/admin/update_edit.html
+++ b/templates/web/zurich/admin/update_edit.html
@@ -1,7 +1,7 @@
[% INCLUDE 'admin/header.html' title=tprintf(loc('Editing update %d'), update.id ) -%]
[% PROCESS 'admin/report_blocks.html' %]
-[% status_message %]
+[% INCLUDE status_message %]
<form method="post" action="[% c.uri_for( 'update_edit', update.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
<input type="hidden" name="token" value="[% csrf_token %]" >
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-20 05:23:09 +0000