diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-05-19 18:00:39 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-05-19 18:00:39 +0100 |
| commit | 1924271f0a93edb6cfc16d3ee3087939e89a65a9 (patch) | |
| tree | d2316ee71ea70be60b4393530a9248ceda38e58c | |
| parent | 70a2f78eff9fd792c7cb04997bffd48858723917 (diff) | |
display error if bad photo upload
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/Update.pm | 5 | ||||
| -rw-r--r-- | templates/web/default/report/display.html | 3 |
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"> |