mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch 'master' into PHRAS-2879_facet-order_4.1
This commit is contained in:
@@ -458,9 +458,9 @@ class AccountController extends Controller
|
||||
->setZipCode($request->request->get("form_zip"))
|
||||
->setPhone($request->request->get("form_phone"))
|
||||
->setFax($request->request->get("form_fax"))
|
||||
->setJob($request->request->get("form_activity"))
|
||||
->setJob($request->request->get("form_function"))
|
||||
->setCompany($request->request->get("form_company"))
|
||||
->setPosition($request->request->get("form_function"))
|
||||
->setPosition($request->request->get("form_activity"))
|
||||
->setNotifications((Boolean) $request->request->get("mail_notifications"));
|
||||
|
||||
$service->updateAccount($command);
|
||||
|
@@ -657,8 +657,8 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
|
||||
->setEmail($parm['email'])
|
||||
->setAddress($parm['address'])
|
||||
->setZipCode($parm['zip'])
|
||||
->setActivity($parm['function'])
|
||||
->setJob($parm['activite'])
|
||||
->setActivity($parm['activite'])
|
||||
->setJob($parm['function'])
|
||||
->setCompany($parm['company'])
|
||||
->setPhone($parm['telephone'])
|
||||
->setFax($parm['fax']);
|
||||
|
Reference in New Issue
Block a user