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

Merge pull request #1360 from bburnichon/feature/controller-as-service

Browse Source 
controller as service
This commit is contained in:
Benoît Burnichon
2015-05-07 16:09:40 +02:00
parent a104ebd72c 554239d366
commit 5eb7af9542
62 changed files with 2989 additions and 2383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/record/adapter.php
View File

@@ -27,6 +27,7 @@ use Alchemy\Phrasea\SearchEngine\SearchEngineInterface;
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
use Doctrine\ORM\EntityManager;
use Doctrine\Common\Collections\ArrayCollection;
use MediaVorus\Media\MediaInterface;
use MediaVorus\MediaVorus;
use Rhumsaa\Uuid\Uuid;
use Alchemy\Phrasea\Model\RecordInterface;
@@ -755,7 +756,6 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
}
/**
*
* @return caption_record
*/
public function get_caption()
@@ -1722,8 +1722,8 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
public function get_container_baskets(EntityManager $em, User $user)
{
return $em
->getRepository('Phraseanet:Basket')
->findContainingRecordForUser($this, $user);
->getRepository('Phraseanet:Basket')
->findContainingRecordForUser($this, $user);
}
/**