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

Merge branch 'master' into PHRAS-2741-api-leaves-temporary-file-41

Browse Source
This commit is contained in:
Nicolas Maillat
2019-09-06 15:00:20 +02:00
committed by GitHub
parent bb8c311b42 c2b5d0cc5f
commit b260bc0688
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -47,7 +47,7 @@
"php": ">=5.5.9", "php": ">=5.5.9",
"ext-intl": "*", "ext-intl": "*",
"alchemy-fr/tcpdf-clone": "~6.0", "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/geonames-api-consumer": "~0.1.0",
"alchemy/mediavorus": "^0.4.4", "alchemy/mediavorus": "^0.4.4",
"alchemy/oauth2php": "1.1.0", "alchemy/oauth2php": "1.1.0",

18
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "64830cb4d53b32b47e02d4a19df9cef2", "content-hash": "f3b1fc0a30bf14b05e57ce673550d9c0",
"packages": [ "packages": [
{ {
"name": "alchemy-fr/tcpdf-clone", "name": "alchemy-fr/tcpdf-clone",
@@ -131,16 +131,16 @@
}, },
{ {
"name": "alchemy/embed-bundle", "name": "alchemy/embed-bundle",
"version": "2.0.6", "version": "2.0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/alchemy-fr/embed-bundle.git", "url": "https://github.com/alchemy-fr/embed-bundle.git",
"reference": "53ba295dfd0554a31c35e93902a5ef6cb8eca31a" "reference": "c585ccf18e53a9a6f2b696ddbbc39521732dfdde"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/53ba295dfd0554a31c35e93902a5ef6cb8eca31a", "url": "https://api.github.com/repos/alchemy-fr/embed-bundle/zipball/c585ccf18e53a9a6f2b696ddbbc39521732dfdde",
"reference": "53ba295dfd0554a31c35e93902a5ef6cb8eca31a", "reference": "c585ccf18e53a9a6f2b696ddbbc39521732dfdde",
"shasum": "" "shasum": ""
}, },
"require-dev": { "require-dev": {
@@ -178,10 +178,10 @@
], ],
"description": "Embed resources bundle", "description": "Embed resources bundle",
"support": { "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" "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", "name": "alchemy/geonames-api-consumer",
@@ -443,8 +443,8 @@
}, },
{ {
"name": "Benoit Burnichon", "name": "Benoit Burnichon",
"email": "bburnichon@alchemy.fr", "role": "Lead Developer",
"role": "Lead Developer" "email": "bburnichon@alchemy.fr"
} }
], ],
"description": "Exiftool driver for PHP", "description": "Exiftool driver for PHP",

2
lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
View File

@@ -1997,7 +1997,7 @@ class V1Controller extends Controller
return $this->getBadRequestAction($request); 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)); $record->setStatus(strrev($datas));

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

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

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

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