From fe087a9dc5d6ed4ff97e428eb6eb8f524f1b7d09 Mon Sep 17 00:00:00 2001
From: aynsix <asr@esokia-webagency.com>
Date: Wed, 4 Sep 2019 12:09:53 +0400
Subject: [PATCH] fix user creation from push and feedback window

---
 .../Phrasea/Controller/Prod/PushController.php        | 11 ++++++++---
 templates/web/admin/editusers.html.twig               |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
index 569537fed3..f9ce528e41 100644
--- a/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
+++ b/lib/Alchemy/Phrasea/Controller/Prod/PushController.php
@@ -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);
diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig
index 4b07dea1d3..2421976775 100644
--- a/templates/web/admin/editusers.html.twig
+++ b/templates/web/admin/editusers.html.twig
@@ -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>