display correct error messages and test for bad problem ids

1 files changed, 5 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm
index 030f69cc2..bb3581144 100644
--- a/perllib/FixMyStreet/App/Controller/Contact.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact.pm
@@ -114,6 +114,7 @@ sub determine_contact_type : Private {
         elsif ($problem) {
             $c->stash->{problem} = $problem;
         }
+        $c->stash->{id} = $id;
     }
 
     return 1;
@@ -145,6 +146,10 @@ sub validate : Private {
           or $c->req->param('update_id')
           && $c->req->param('update_id') !~ /^[1-9]\d*$/;
 
+    unshift @errors,
+      _('There were problems with your report. Please see below.')
+      if scalar keys %field_errors;
+
     if ( @errors or scalar keys %field_errors ) {
         $c->stash->{errors}       = \@errors;
         $c->stash->{field_errors} = \%field_errors;