hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 07:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1274 from nlegoff/fix-gh-1271

Browse Source 
[3.9] Fix #1271 Can not add user trough validation process
This commit is contained in:
Nicolas Le Goff
2015-03-10 09:50:49 +01:00
parent 1576c2f159 3f6bb70b57
commit 09a2224cdd
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Alchemy/Phrasea/Controller/Prod/Push.php
View File

@@ -509,17 +509,14 @@ class Push implements ControllerProviderInterface
$user = null; $user = null;
$email = $request->request->get('email'); $email = $request->request->get('email');
try { if (null !== $user = $app['repo.users']->findByEmail($email)) {
$user = $app['repo.users']->findByEmail($email);
$result['message'] = $app->trans('User already exists'); $result['message'] = $app->trans('User already exists');
$result['success'] = true; $result['success'] = true;
$result['user'] = $userFormatter($user); $result['user'] = $userFormatter($user);
} catch (\Exception $e) {
return $app->json($result);
} }
if (!$user instanceof User) {
try { try {
$password = $app['random.medium']->generateString(128); $password = $app['random.medium']->generateString(128);
@@ -544,7 +541,6 @@ class Push implements ControllerProviderInterface
} catch (\Exception $e) { } catch (\Exception $e) {
$result['message'] = $app->trans('Error while creating user'); $result['message'] = $app->trans('Error while creating user');
} }
}
return $app->json($result); return $app->json($result);
})->bind('prod_push_do_add_user'); })->bind('prod_push_do_add_user');