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

Delete references to usr.usr_id field in entities

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/conf.d/migrations.yml

Conflicts:
	lib/Alchemy/Phrasea/ACL/BasketACL.php
	lib/Alchemy/Phrasea/Authentication/Authenticator.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Model/Entities/Basket.php
	lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
	lib/Alchemy/Phrasea/Model/Entities/Feed.php
	lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
	lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
	lib/Alchemy/Phrasea/Model/Entities/Session.php
	lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
	lib/Alchemy/Phrasea/Model/Entities/UsrList.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
	lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
	lib/classes/API/V1/adapter.php
	templates/mobile/lightbox/sc_note.html.twig
	templates/web/admin/connected-users.html.twig
	templates/web/admin/publications/fiche.html.twig
	templates/web/lightbox/IE6/agreement_box.html.twig
	templates/web/lightbox/agreement_box.html.twig
	templates/web/lightbox/basket_content_report.html.twig
	templates/web/lightbox/sc_note.html.twig
	templates/web/prod/WorkZone/Browser/Basket.html.twig
	templates/web/prod/WorkZone/Browser/Results.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Feedback/List-Share.html.twig
	templates/web/prod/actions/Feedback/ListsMacros.html.twig
	templates/web/prod/orders/order_box.html.twig
	templates/web/prod/orders/order_item.html.twig
	templates/web/prod/upload/lazaret.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
This commit is contained in:
Nicolas Le Goff
2013-11-18 12:58:49 +01:00
parent 0e1203f595
commit 26bd977d5f
82 changed files with 623 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/patch/320alpha4b.php
View File

@@ -201,7 +201,7 @@ class patch_320alpha4b implements patchInterface
$feed->addPublisher($publisher);
$publisher->setFeed($feed);
$publisher->setOwner(true);
$publisher->setUsrId($user->getId());
$publisher->setUser($user);
if ($homelink) {
$feed->setPublic(true);

4
lib/classes/patch/370alpha7a.php
View File

@@ -111,8 +111,10 @@ class patch_370alpha7a implements patchInterface
$borderFile = new \Alchemy\Phrasea\Border\File($app, $media, $collection);
$user = $app['manipulator.user']->getRepository()->find($row['usr_id']);
$lazaretSession = new LazaretSession();
$lazaretSession->setUsrId($row['usr_id']);
$lazaretSession->setUser($user);
$lazaretFile = new LazaretFile();
$lazaretFile->setBaseId($row['base_id']);

4
lib/classes/patch/380alpha11a.php
View File

@@ -80,9 +80,11 @@ class patch_380alpha11a implements patchInterface
$updated = \DateTime::createFromFormat('Y-m-d H:i:s', $row['lastaccess']);
}
$user = $app['manipulator.user']->getRepository()->find($row['usr_id']);
$session = new Session();
$session
->setUsrId($row['usr_id'])
->setUser($user)
->setUserAgent($row['user_agent'])
->setUpdated($updated)
->setToken($row['token'])

4
lib/classes/patch/390alpha1a.php
View File

@@ -70,6 +70,8 @@ class patch_390alpha1a implements patchInterface
$em = $app['EM'];
foreach ($rs as $row) {
$user = $app['manipulator.user']->getRepository()->find($row['usr_id']);
$credential = new FtpCredential();
$credential->setActive($row['activeFTP']);
$credential->setAddress($row['addrFTP']);
@@ -79,7 +81,7 @@ class patch_390alpha1a implements patchInterface
$credential->setPassword($row['pwdFTP']);
$credential->setReceptionFolder($row['destFTP']);
$credential->setRepositoryPrefixName($row['prefixFTPfolder']);
$credential->setUsrId($row['usr_id']);
$credential->setUser($user);
$em->persist($credential);

4
lib/classes/patch/390alpha1b.php
View File

@@ -92,8 +92,10 @@ class patch_390alpha1b implements patchInterface
$todo = $stmt->fetch(\PDO::FETCH_ASSOC);
$stmt->closeCursor();
$user = $app['manipulator.user']->getRepository()->find($row['usr_id']);
$order = new Order();
$order->setUsrId($row['usr_id'])
$order->setUser($user)
->setTodo($todo['todo'])
->setOrderUsage($row['usage'])
->setDeadline(new \DateTime($row['deadline']))

4
lib/classes/patch/390alpha3a.php
View File

@@ -73,9 +73,11 @@ class patch_390alpha3a implements patchInterface
$em = $app['EM'];
foreach ($rs as $row) {
$user = $app['manipulator.user']->getRepository()->find($row['usr_id']);
$userQuery = new UserQuery();
$userQuery->setQuery($row['query']);
$userQuery->setUsrId($row['usr_id']);
$userQuery->setUser($user);
$em->persist($userQuery);

4
lib/classes/patch/390alpha4a.php
View File

@@ -77,10 +77,12 @@ class patch_390alpha4a implements patchInterface
continue;
}
$user = $app['manipulator.user']->getRepository()->find($row['usr_id']);
$userSetting = new UserSetting();
$userSetting->setName($row['prop']);
$userSetting->setValue($row['value']);
$userSetting->setUsrId($row['usr_id']);
$userSetting->setUser($user);
$em->persist($userSetting);

4
lib/classes/patch/390alpha5a.php
View File

@@ -74,10 +74,12 @@ class patch_390alpha5a implements patchInterface
$em = $app['EM'];
foreach ($rs as $row) {
$user = $app['manipulator.user']->getRepository()->find($row['usr_id']);
$userSetting = new UserNotificationSetting();
$userSetting->setName($row['prop']);
$userSetting->setValue($row['value']);
$userSetting->setUsrId($row['usr_id']);
$userSetting->setUser($user);
$em->persist($userSetting);

12
lib/classes/patch/390alpha7a.php
View File

@@ -133,12 +133,14 @@ class patch_390alpha7a implements patchInterface
$fpRes = $fpStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($fpRes as $fpRow) {
$user = $app['manipulator.user']->getRepository()->find($fpRow['usr_id']);
$feedPublisher = new FeedPublisher();
$feedPublisher->setFeed($feed);
$feed->addPublisher($feedPublisher);
$feedPublisher->setCreatedOn(new \DateTime($fpRow['created_on']));
$feedPublisher->setIsOwner((Boolean) $fpRow['owner']);
$feedPublisher->setUsrId($fpRow['usr_id']);
$feedPublisher->setUser($user);
$feStmt->execute([':feed_id' => $row['id'], ':publisher_id' => $fpRow['id']]);
$feRes = $feStmt->fetchAll(\PDO::FETCH_ASSOC);
@@ -177,10 +179,12 @@ class patch_390alpha7a implements patchInterface
$ftRes = $ftStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($ftRes as $ftRow) {
$user = $app['manipulator.user']->getRepository()->find($ftRow['usr_id']);
$token = new FeedToken();
$token->setFeed($feed);
$feed->addToken($token);
$token->setUsrId($ftRow['usr_id']);
$token->setUser($user);
$token->setValue($ftRow['token']);
$em->persist($token);
@@ -204,8 +208,10 @@ class patch_390alpha7a implements patchInterface
$faRes = $faStmt->fetchAll(\PDO::FETCH_ASSOC);
foreach ($faRes as $faRow) {
$user = $app['manipulator.user']->getRepository()->find($faRow['usr_id']);
$token = new AggregateToken();
$token->setUsrId($faRow['usr_id']);
$token->setUser($user);
$token->setValue($faRow['token']);
$em->persist($token);