Show logged in message as success, not error.

Fixes #357.
Also consolidate almost-identical fill_in_details.html template
(for #344).

2 files changed, 4 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 1e9f83aec..ed5be4e99 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -759,7 +759,7 @@ sub process_user : Private {
         $report->user( $user );
         $report->name( $user->name );
         $c->stash->{check_name} = 1;
-        $c->stash->{field_errors}->{name} = _('You have successfully signed in; please check and confirm your details are accurate:');
+        $c->stash->{login_success} = 1;
         $c->log->info($user->id . ' logged in during problem creation');
         return 1;
     }
@@ -984,7 +984,7 @@ sub check_for_errors : Private {
     }
 
     # all good if no errors
-    return 1 unless scalar keys %field_errors;
+    return 1 unless scalar keys %field_errors || $c->stash->{login_success};
 
     $c->stash->{field_errors} = \%field_errors;
 
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index bc79cafd3..b97420238 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -137,7 +137,7 @@ sub process_user : Private {
         my $user = $c->user->obj;
         $update->user( $user );
         $update->name( $user->name );
-        $c->stash->{field_errors}->{name} = _('You have successfully signed in; please check and confirm your details are accurate:');
+        $c->stash->{login_success} = 1;
         return 1;
     }
 
@@ -290,6 +290,7 @@ sub check_for_errors : Private {
     # all good if no errors
     return 1
       unless ( scalar keys %field_errors
+        || $c->stash->{login_success}
         || ( $c->stash->{errors} && scalar @{ $c->stash->{errors} } ) );
 
     $c->stash->{field_errors} = \%field_errors;