From b64f677c47f43e88c5a70fc6cb8fe27256b27b05 Mon Sep 17 00:00:00 2001 From: aynsix Date: Mon, 2 Sep 2019 17:30:34 +0400 Subject: [PATCH 1/3] embed-bundle on version 2.0.7 --- composer.json | 2 +- composer.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index ca14bb88f0..47635b0e47 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "php": ">=5.5.9", "ext-intl": "*", "alchemy-fr/tcpdf-clone": "~6.0", - "alchemy/embed-bundle": "^2.0.6", + "alchemy/embed-bundle": "^2.0.7", "alchemy/geonames-api-consumer": "~0.1.0", "alchemy/mediavorus": "^0.4.4", "alchemy/oauth2php": "1.1.0", diff --git a/composer.lock b/composer.lock index 5721974b41..3794bfe80c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "64830cb4d53b32b47e02d4a19df9cef2", + "content-hash": "f3b1fc0a30bf14b05e57ce673550d9c0", "packages": [ { "name": "alchemy-fr/tcpdf-clone", @@ -131,16 +131,16 @@ }, { "name": "alchemy/embed-bundle", - "version": "2.0.6", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/alchemy-fr/embed-bundle.git", - "reference": "53ba295dfd0554a31c35e93902a5ef6cb8eca31a" + "reference": "c585ccf18e53a9a6f2b696ddbbc39521732dfdde" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/53ba295dfd0554a31c35e93902a5ef6cb8eca31a", - "reference": "53ba295dfd0554a31c35e93902a5ef6cb8eca31a", + "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/c585ccf18e53a9a6f2b696ddbbc39521732dfdde", + "reference": "c585ccf18e53a9a6f2b696ddbbc39521732dfdde", "shasum": "" }, "require-dev": { @@ -178,10 +178,10 @@ ], "description": "Embed resources bundle", "support": { - "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.6", + "source": "https://github.com/alchemy-fr/embed-bundle/tree/2.0.7", "issues": "https://github.com/alchemy-fr/embed-bundle/issues" }, - "time": "2019-07-11T12:59:49+00:00" + "time": "2019-09-02T12:28:19+00:00" }, { "name": "alchemy/geonames-api-consumer", @@ -443,8 +443,8 @@ }, { "name": "Benoit Burnichon", - "email": "bburnichon@alchemy.fr", - "role": "Lead Developer" + "role": "Lead Developer", + "email": "bburnichon@alchemy.fr" } ], "description": "Exiftool driver for PHP", From 53272de3f5e8bea2bd3877a48b122daf8d31dbd8 Mon Sep 17 00:00:00 2001 From: Jean-Yves Gaulier Date: Tue, 3 Sep 2019 18:07:36 +0200 Subject: [PATCH 2/3] PHRAS-2726_setstatus-api_4.1 : port of PHRAS-2716 setstatus api did change unspecified bits due to string offset error --- lib/Alchemy/Phrasea/Controller/Api/V1Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php index 54c246a897..5bb3e10614 100644 --- a/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php +++ b/lib/Alchemy/Phrasea/Controller/Api/V1Controller.php @@ -1984,7 +1984,7 @@ class V1Controller extends Controller return $this->getBadRequestAction($request); } - $datas = substr($datas, 0, ($n)) . $value . substr($datas, ($n + 2)); + $datas = substr($datas, 0, ($n)) . $value . substr($datas, ($n + 1)); } $record->setStatus(strrev($datas)); From fe087a9dc5d6ed4ff97e428eb6eb8f524f1b7d09 Mon Sep 17 00:00:00 2001 From: aynsix Date: Wed, 4 Sep 2019 12:09:53 +0400 Subject: [PATCH 3/3] 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 }} - + @@ -528,7 +528,7 @@ {{ 'admin::compte-utilisateur activite' | trans }} - +