hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 03:23:19 +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

14
lib/classes/API/V1/adapter.php
View File

@@ -659,7 +659,7 @@ class API_V1_adapter extends API_V1_Abstract
}
$session = new Alchemy\Phrasea\Model\Entities\LazaretSession();
$session->setUsrId($app['authentication']->getUser()->getId());
$session->setUser($app['authentication']->getUser());
$app['EM']->persist($session);
$app['EM']->flush();
@@ -784,8 +784,8 @@ class API_V1_adapter extends API_V1_Abstract
}
$usr_id = null;
if ($file->getSession()->getUser($this->app)) {
$usr_id = $file->getSession()->getUser($this->app)->getId();
if ($file->getSession()->getUser()) {
$usr_id = $file->getSession()->getUser()->getId();
}
$session = [
@@ -877,7 +877,7 @@ class API_V1_adapter extends API_V1_Abstract
$search_result = $this->app['phraseanet.SE']->query($query, $offsetStart, $perPage, $options);
$userQuery = new UserQuery();
$userQuery->setUsrId($this->app['authentication']->getUser()->getId());
$userQuery->setUser($this->app['authentication']->getUser());
$userQuery->setQuery($query);
$this->app['EM']->persist($userQuery);
@@ -1272,7 +1272,7 @@ class API_V1_adapter extends API_V1_Abstract
}
$Basket = new Basket();
$Basket->setOwner($this->app['authentication']->getUser());
$Basket->setUser($this->app['authentication']->getUser());
$Basket->setName($name);
$this->app['EM']->persist($Basket);
@@ -1369,7 +1369,7 @@ class API_V1_adapter extends API_V1_Abstract
foreach ($basket_element->getValidationDatas() as $validation_datas) {
$participant = $validation_datas->getParticipant();
$user = $participant->getUser($this->app);
$user = $participant->getUser();
/* @var $validation_datas ValidationData */
$choices[] = [
'validation_user' => [
@@ -1814,7 +1814,7 @@ class API_V1_adapter extends API_V1_Abstract
foreach ($basket->getValidation()->getParticipants() as $participant) {
/* @var $participant ValidationParticipant */
$user = $participant->getUser($this->app);
$user = $participant->getUser();
$users[] = [
'usr_id' => $user->getId(),