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

Merge branch 'master' into PHRAS-2727-unit-test-setstatus

Browse Source
This commit is contained in:
Nicolas Maillat
2019-09-06 15:51:43 +02:00
committed by GitHub
parent 418b86c0ba c2b5d0cc5f
commit 0f3c2ea0ee
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Alchemy/Phrasea/Controller/Prod/PushController.php
View File

@@ -463,6 +463,8 @@ class PushController extends Controller
}
try {
$manager = $this->getEntityManager();
$password = $this->getRandomGenerator()->generateString(128);
$user = $this->getUserManipulator()->createUser($email, $password, $email);
@@ -476,12 +478,15 @@ class PushController extends Controller
$user->setCompany($request->request->get('company'));
}
if ($request->request->get('job')) {
$user->setCompany($request->request->get('job'));
$user->setJob($request->request->get('job'));
}
if ($request->request->get('form_geonameid')) {
$this->getUserManipulator()->setGeonameId($user, $request->request->get('form_geonameid'));
if ($request->request->get('city')) {
$this->getUserManipulator()->setGeonameId($user, $request->request->get('city'));
}
$manager->persist($user);
$manager->flush();
$result['message'] = $this->app->trans('User successfully created');
$result['success'] = true;
$result['user'] = $this->formatUser($user);

4
templates/web/admin/editusers.html.twig
View File

@@ -512,7 +512,7 @@
{{ 'admin::compte-utilisateur poste' | trans }}
</td>
<td>
<input type="text" name="function" value="{{main_user.getActivity()}}"/>
<input type="text" name="function" value="{{main_user.getJob()}}"/>
</td>
</tr>
<tr>
@@ -528,7 +528,7 @@
{{ 'admin::compte-utilisateur activite' | trans }}
</td>
<td>
<input type="text" name="activite" value="{{main_user.getJob()}}"/>
<input type="text" name="activite" value="{{main_user.getActivity()}}"/>
</td>
</tr>