diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin/Bodies.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/admin/translations.t | 2 | ||||
| -rw-r--r-- | templates/web/base/admin/bodies/contact-form.html | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e718a42a9..428c1a4cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ - Add front-end testing support for WSL. #2514 - Allow cobrands to disable admin resending. - Sass variables for default link colour and decoration. + - Make contact edit note optional on staging sites. - Open311 improvements: - Support use of 'private' service definition <keywords> to mark reports made in that category private. #2488 diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm index ca615f186..f47ec7a2f 100644 --- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm +++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm @@ -220,7 +220,7 @@ sub update_contact : Private { my $category = $self->trim( $c->get_param('category') ); $errors{category} = _("Please choose a category") unless $category; - $errors{note} = _('Please enter a message') unless $c->get_param('note'); + $errors{note} = _('Please enter a message') unless $c->get_param('note') || FixMyStreet->config('STAGING_SITE'); my $contact = $c->model('DB::Contact')->find_or_new( { diff --git a/t/app/controller/admin/translations.t b/t/app/controller/admin/translations.t index f5c32baa6..442be68d5 100644 --- a/t/app/controller/admin/translations.t +++ b/t/app/controller/admin/translations.t @@ -59,7 +59,7 @@ subtest 'check add category with translation' => sub { $mech->submit_form_ok( { with_fields => { category => 'Potholes', translation_de => 'DE potholes', - email => 'potholes@example.org', + email => 'potholes', } } ); # check that error page includes translations diff --git a/templates/web/base/admin/bodies/contact-form.html b/templates/web/base/admin/bodies/contact-form.html index 7f559274d..4a2323865 100644 --- a/templates/web/base/admin/bodies/contact-form.html +++ b/templates/web/base/admin/bodies/contact-form.html @@ -143,7 +143,7 @@ <p class="form-group" style="margin-top: 2em"> <label for="note">[% loc('Summarise your changes') %]</label> <span class="form-hint" id="note-hint">[% loc("If you’ve made changes, leave a note explaining what, for other admins to see.") %]</span> - <input class="form-control" type="text" id="note" name="note" size="30" aria-describedby="note-hint" required> + <input class="form-control" type="text" id="note" name="note" size="30" aria-describedby="note-hint"[% ' required' UNLESS c.config.STAGING_SITE %]> </p> <p> |