aboutsummaryrefslogtreecommitdiffstats
path: root/perllib/FixMyStreet
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2016-10-26 16:36:04 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-10-26 16:49:55 +0100
commitb42f354d5c4ad7f237a826033c3c176821e4a085 (patch)
treece15578e612eaee3cd0a55e9f019563be4bb4627 /perllib/FixMyStreet
parent0d3c0ee6390aed6bec647b04ee35d575fcb26543 (diff)
Show admin user edit errors.
Fix title if error in adding user. Fixes #1510.
Diffstat (limited to 'perllib/FixMyStreet')
-rw-r--r--perllib/FixMyStreet/App/Controller/Admin.pm8
1 files changed, 4 insertions, 4 deletions
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) {