aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perllib/FixMyStreet/App/Controller/Report/Update.pm5
-rw-r--r--templates/web/default/report/display.html3
2 files changed, 7 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index e1e90bb93..61ca28184 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -189,7 +189,10 @@ sub check_for_errors : Private {
delete $field_errors{name};
# all good if no errors
- return 1 unless scalar keys %field_errors;
+ return 1
+ unless ( scalar keys %field_errors
+ || scalar @{ $c->stash->{errors} }
+ || $c->stash->{photo_error} );
$c->stash->{field_errors} = \%field_errors;
diff --git a/templates/web/default/report/display.html b/templates/web/default/report/display.html
index b0f7d2a4f..c1981c093 100644
--- a/templates/web/default/report/display.html
+++ b/templates/web/default/report/display.html
@@ -104,6 +104,9 @@
[% IF allow_photo_upload %]
+ [% IF photo_error %]
+ <div class='form-error'>[% photo_error %]</div>
+ [% END %]
<div id="fileupload_normalUI">
<label for="form_photo">[% loc('Photo:') %]</label>
<input type="file" name="photo" id="form_photo">