From b42f354d5c4ad7f237a826033c3c176821e4a085 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Wed, 26 Oct 2016 16:36:04 +0100
Subject: Show admin user edit errors.

Fix title if error in adding user. Fixes #1510.
---
 perllib/FixMyStreet/App/Controller/Admin.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perllib/FixMyStreet/App/Controller/Admin.pm')

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index f0a1fa95b..d5a6486fd 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1182,14 +1182,14 @@ sub user_add : Path('user_edit') : Args(0) {
 
     $c->forward('/auth/check_csrf_token');
 
+    $c->stash->{field_errors} = {};
     unless ($c->get_param('email')) {
         $c->stash->{field_errors}->{email} = _('Please enter a valid email');
-        return;
     }
     unless ($c->get_param('name')) {
         $c->stash->{field_errors}->{name} = _('Please enter a name');
-        return;
     }
+    return if %{$c->stash->{field_errors}};
 
     my $user = $c->model('DB::User')->find_or_create( {
         name => $c->get_param('name'),
@@ -1326,14 +1326,14 @@ sub user_edit : Path('user_edit') : Args(1) {
             }
         }
 
+        $c->stash->{field_errors} = {};
         unless ($user->email) {
             $c->stash->{field_errors}->{email} = _('Please enter a valid email');
-            return;
         }
         unless ($user->name) {
             $c->stash->{field_errors}->{name} = _('Please enter a name');
-            return;
         }
+        return if %{$c->stash->{field_errors}};
 
         my $existing_user = $c->model('DB::User')->search({ email => $user->email, id => { '!=', $user->id } })->first;
         if ($existing_user) {
-- 
cgit v1.2.3