aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perllib/FixMyStreet/App/Controller/Admin.pm11
-rw-r--r--t/app/controller/admin.t1
-rw-r--r--templates/web/base/admin/body.html61
-rw-r--r--templates/web/base/admin/body_edit.html2
4 files changed, 51 insertions, 24 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index cfe165f43..c1df8622f 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -343,8 +343,13 @@ sub update_contacts : Private {
if ( $posted eq 'new' ) {
$c->forward('check_token');
+ my %errors;
+
my $category = $self->trim( $c->req->param( 'category' ) );
+ $errors{category} = _("Please choose a category") unless $category;
my $email = $self->trim( $c->req->param( 'email' ) );
+ $errors{email} = _('Please enter a valid email') unless is_valid_email($email);
+ $errors{note} = _('Please enter a message') unless $c->req->param('note');
$category = 'Empty property' if $c->cobrand->moniker eq 'emptyhomes';
@@ -367,7 +372,11 @@ sub update_contacts : Private {
$contact->api_key( $c->req->param('api_key') );
$contact->send_method( $c->req->param('send_method') );
- if ( $contact->in_storage ) {
+ if ( %errors ) {
+ $c->stash->{updated} = _('Please correct the errors below');
+ $c->stash->{contact} = $contact;
+ $c->stash->{errors} = \%errors;
+ } elsif ( $contact->in_storage ) {
$c->stash->{updated} = _('Values updated');
# NB: History is automatically stored by a trigger in the database
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t
index bf7a9ed70..2cc88ccc3 100644
--- a/t/app/controller/admin.t
+++ b/t/app/controller/admin.t
@@ -219,6 +219,7 @@ subtest 'check contact editing' => sub {
$mech->content_contains( '<td>test2 note' );
$mech->content_contains( '<td>Public' );
+ $mech->get_ok('/admin/body_edit/2650/test%20category');
$mech->submit_form_ok( { with_fields => {
email => 'test2@example.com',
note => 'test2 note',
diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html
index b207d18ca..bc815ae62 100644
--- a/templates/web/base/admin/body.html
+++ b/templates/web/base/admin/body.html
@@ -6,6 +6,8 @@
</p>
[% END %]
+[% IF NOT errors %]
+
<p>
[% IF example_pc %]
<a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]" class="admin-offsite-link">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> |
@@ -61,18 +63,18 @@
<th>[% loc('When edited') %]</th>
<th>[% loc('Confirm') %]</th>
</tr>
- [% WHILE ( contact = contacts.next ) %]
- <tr [% IF contact.deleted %]class="is-deleted"[% END %]>
- <td class="contact-category"><a href="[% c.uri_for( 'body_edit', body_id, contact.category ) %]">[% contact.category %]</a></td>
- <td>[% contact.email | html %]</td>
- <td>[% IF contact.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
- <td>[% IF contact.deleted %]<strong>[% loc('Yes') %]</strong>[% ELSE %][% loc('No') %][% END %]</td>
- <td>[% IF body.can_be_devolved && contact.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
- <td>[% contact.editor %]</td>
- <td>[% contact.note | html %]</td>
- <td>[% contact.non_public ? loc('Non Public') : loc('Public') %]</td>
- <td>[% contact.whenedited.ymd _ ' ' _ contact.whenedited.hms %]</td>
- <td><input type="checkbox" name="confirmed" value="[% contact.category %]"></td>
+ [% WHILE ( cat = contacts.next ) %]
+ <tr [% IF cat.deleted %]class="is-deleted"[% END %]>
+ <td class="contact-category"><a href="[% c.uri_for( 'body_edit', body_id, cat.category ) %]">[% cat.category %]</a></td>
+ <td>[% cat.email | html %]</td>
+ <td>[% IF cat.confirmed %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
+ <td>[% IF cat.deleted %]<strong>[% loc('Yes') %]</strong>[% ELSE %][% loc('No') %][% END %]</td>
+ <td>[% IF body.can_be_devolved && cat.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %]</td>
+ <td>[% cat.editor %]</td>
+ <td>[% cat.note | html %]</td>
+ <td>[% cat.non_public ? loc('Non Public') : loc('Public') %]</td>
+ <td>[% cat.whenedited.ymd _ ' ' _ cat.whenedited.hms %]</td>
+ <td><input type="checkbox" name="confirmed" value="[% cat.category %]"></td>
</tr>
[% END %]
</table>
@@ -84,14 +86,25 @@
</p>
</form>
-<div class="admin-box">
- <h2>[% loc('Add new category') %]</h2>
- <p class="fms-admin-info">
+<p class="fms-admin-info">
[% loc("Each contact for the body has a category, which is displayed to the public.
Different categories <strong>can have the same contact</strong> (email address).
This means you can add many categories even if you only have one contact for the body.
") %]
- </p>
+</p>
+
+[% END %][%# Only show all the above if no errors with below form %]
+
+<div class="admin-box">
+ [% IF NOT contact %]
+ <h2>[% loc('Add new category') %]</h2>
+ [% END %]
+
+[% IF errors %]
+<div class="fms-admin-warning">
+ [% errors.values.join('<br>') %]
+</div>
+[% END %]
<form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
@@ -106,7 +119,7 @@
</p>
</div>
<p>
- <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30">
+ <strong>[% loc('Category:') %] </strong><input type="text" name="category" size="30" value="[% contact.category | html %]">
</p>
[% END %]
@@ -123,7 +136,7 @@
</div>
<p>
- <strong>[% loc('Email address:') %] </strong><input type="text" name="email" size="30">
+ <strong>[% loc('Email address:') %] </strong><input type="text" name="email" size="30" value="[% contact.email | html %]">
</p>
<div class="admin-hint">
@@ -133,7 +146,7 @@
</p>
</div>
<p>
- <input type="checkbox" name="confirmed" value="1" id="confirmed">
+ <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]>
<label for="confirmed" class="inline">[% loc('Confirmed') %]</label>
</p>
@@ -144,7 +157,7 @@
</p>
</div>
<p>
- <input type="checkbox" name="deleted" value="1" id="deleted">
+ <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]>
<label for="deleted" class="inline">[% loc('Deleted') %]</label>
</p>
@@ -169,14 +182,14 @@
</p>
</div>
<p>
- <input type="checkbox" name="non_public" value="1" id="non_public">
+ <input type="checkbox" name="non_public" value="1" id="non_public" [% ' checked' IF contact.non_public %]>
<label for="non_public" class="inline">[% loc('Private') %]</label>
</p>
<p>
<input type="hidden" name="posted" value="new" >
<input type="hidden" name="token" value="[% token %]" >
- <input type="submit" name="Create category" value="[% loc('Create category') %]" >
+ <input type="submit" name="Create category" value="[% errors ? loc('Save changes') : loc('Create category') %]" >
</p>
<div>
@@ -185,8 +198,12 @@
</div>
</form>
</div>
+
+[% IF NOT errors %]
<div class="admin-box">
<h2>[% loc('Edit body details') %]</h2>
[% INCLUDE 'admin/body-form.html' %]
</div>
+[% END %][%# Only show all the above if no errors with category form %]
+
[% INCLUDE 'admin/footer.html' %]
diff --git a/templates/web/base/admin/body_edit.html b/templates/web/base/admin/body_edit.html
index f2bae0c0b..ef7a0a11c 100644
--- a/templates/web/base/admin/body_edit.html
+++ b/templates/web/base/admin/body_edit.html
@@ -41,7 +41,7 @@
[% END %]
</p>
- <p><strong>[% loc('Note:') %] </strong><textarea name="note" rows="3" cols="40">[% contact.note | html %]</textarea>
+ <p><strong>[% loc('Note:') %] </strong><textarea name="note" rows="3" cols="40"></textarea>
[% IF body.can_be_devolved %]
<h2>[% loc('Configure Endpoint') %]</h2>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 15:45:35 +0000