hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unit tests

Browse Source
This commit is contained in:
Romain Neutron
2014-02-20 12:34:53 +01:00
parent ad34bfa854
commit 25073721c8
10 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
lib/Alchemy/Phrasea/Controller/Root/Account.php
View File

@@ -362,47 +362,41 @@ class Account implements ControllerProviderInterface
];
if (0 === count(array_diff($accountFields, array_keys($request->request->all())))) {
$app['authentication']->getUser()
->setGender($request->request->get("form_gender"))
->setFirstName($request->request->get("form_firstname"))
->setLastName($request->request->get("form_lastname"))
->setAddress($request->request->get("form_address"))
->setZipCode($request->request->get("form_zip"))
->setPhone($request->request->get("form_phone"))
->setFax($request->request->get("form_fax"))
->setJob($request->request->get("form_activity"))
->setCompany($request->request->get("form_company"))
->setActivity($request->request->get("form_function"))
->setMailNotificationsActivated((Boolean) $request->request->get("mail_notifications"));
try {
$app['manipulator.user']->setGeonameId($app['authentication']->getUser(), $request->request->get("form_geonameid"));
$app['authentication']->getUser()
->setGender($request->request->get("form_gender"))
->setFirstName($request->request->get("form_firstname"))
->setLastName($request->request->get("form_lastname"))
->setAddress($request->request->get("form_address"))
->setZipCode($request->request->get("form_zip"))
->setPhone($request->request->get("form_phone"))
->setFax($request->request->get("form_fax"))
->setJob($request->request->get("form_activity"))
->setCompany($request->request->get("form_company"))
->setActivity($request->request->get("form_function"))
->setMailNotificationsActivated((Boolean) $request->request->get("mail_notifications"));
$ftpCredential = $app['authentication']->getUser()->getFtpCredential();
$app['manipulator.user']->setGeonameId($app['authentication']->getUser(), $request->request->get("form_geonameid"));
$ftpCredential = $app['authentication']->getUser()->getFtpCredential();
if (null === $ftpCredential) {
$ftpCredential = new FtpCredential();
}
$ftpCredential->setActive($request->request->get("form_activeFTP"));
$ftpCredential->setAddress($request->request->get("form_addressFTP"));
$ftpCredential->setLogin($request->request->get("form_loginFTP"));
$ftpCredential->setPassword($request->request->get("form_pwdFTP"));
$ftpCredential->setPassive($request->request->get("form_passifFTP"));
$ftpCredential->setReceptionFolder($request->request->get("form_destFTP"));
$ftpCredential->setRepositoryPrefixName($request->request->get("form_prefixFTPfolder"));
$app['EM']->persist($ftpCredential);
$app['EM']->persist($app['authentication']->getUser());
$app['EM']->flush();
$app->addFlash('success', $app->trans('login::notification: Changements enregistres'));
} catch (\Exception $e) {
$app->addFlash('error', $app->trans('forms::erreurs lors de l\'enregistrement des modifications'));
$app['phraseanet.appbox']->get_connection()->rollBack();
if (null === $ftpCredential) {
$ftpCredential = new FtpCredential();
$ftpCredential->setUser($app['authentication']->getUser());
}
$ftpCredential->setActive($request->request->get("form_activeFTP"));
$ftpCredential->setAddress($request->request->get("form_addressFTP"));
$ftpCredential->setLogin($request->request->get("form_loginFTP"));
$ftpCredential->setPassword($request->request->get("form_pwdFTP"));
$ftpCredential->setPassive($request->request->get("form_passifFTP"));
$ftpCredential->setReceptionFolder($request->request->get("form_destFTP"));
$ftpCredential->setRepositoryPrefixName($request->request->get("form_prefixFTPfolder"));
$app['EM']->persist($ftpCredential);
$app['EM']->persist($app['authentication']->getUser());
$app['EM']->flush();
$app->addFlash('success', $app->trans('login::notification: Changements enregistres'));
}
$requestedNotifications = (array) $request->request->get('notifications', []);

2
lib/Alchemy/Phrasea/Form/TaskForm.php
View File

@@ -49,7 +49,7 @@ class TaskForm extends AbstractType
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$resolver->setDefaults([
'data_class' => 'Phraseanet:Task',
'data_class' => 'Alchemy\Phrasea\Model\Entities\Task',
]);
}

2
lib/Alchemy/Phrasea/Model/Entities/User.php
View File

@@ -424,7 +424,7 @@ class User
self::GENDER_MISS,
self::GENDER_MR,
self::GENDER_MRS
])) {
], true)) {
throw new InvalidArgumentException(sprintf("Invalid gender %s.", $gender));
}

6
lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
View File

@@ -96,13 +96,13 @@ class ValidationSession
}
/**
* Get initiator_id
* Get validation initiator
*
* @return integer
* @return User
*/
public function getInitiator()
{
return $this->initiator_id;
return $this->initiator;
}
/**

2
lib/Alchemy/Phrasea/Model/Repositories/BasketElementRepository.php
View File

@@ -109,7 +109,7 @@ class BasketElementRepository extends EntityRepository
LEFT JOIN b.validation s
LEFT JOIN s.participants p
WHERE b.user = :usr_id
AND b.pusher_id IS NOT NULL
AND b.pusher IS NOT NULL
AND e.record_id = :record_id
AND e.sbas_id = :sbas_id';