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

Remove $app dependency on FeedItemRepository::isRecordInPublicFeed() method.

Browse Source
This commit is contained in:
Benoît Burnichon
2015-05-06 15:33:05 +02:00
parent a104ebd72c
commit 8f8030bb11
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Alchemy/Phrasea/Controller/PermalinkController.php
View File

@@ -13,6 +13,8 @@ namespace Alchemy\Phrasea\Controller;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Authentication\ACLProvider;
use Alchemy\Phrasea\Authentication\Authenticator;
use Alchemy\Phrasea\Model\Repositories\BasketElementRepository;
use Alchemy\Phrasea\Model\Repositories\FeedItemRepository;
use Alchemy\Phrasea\Model\Serializer\CaptionSerializer;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
@@ -85,15 +87,17 @@ class PermalinkController extends AbstractDelivery
/**
* @param \databox $databox
* @param $token
* @param $record_id
* @param string $token
* @param int $record_id
* @param string $subdef
* @return \record_adapter
*/
private function retrieveRecord(\databox $databox, $token, $record_id, $subdef)
{
/** @var FeedItemRepository $feedItemsRepository */
$feedItemsRepository = $this->app['repo.feed-items'];
if (in_array($subdef, [\databox_subdef::CLASS_PREVIEW, \databox_subdef::CLASS_THUMBNAIL])
&& $this->app['repo.feed-items']->isRecordInPublicFeed($this->app, $databox->get_sbas_id(), $record_id)
&& $feedItemsRepository->isRecordInPublicFeed($databox->get_sbas_id(), $record_id)
) {
return $databox->get_record($record_id);
}
@@ -132,6 +136,7 @@ class PermalinkController extends AbstractDelivery
$watermark = !$this->acl->get($this->authentication->getUser())->has_right_on_base($record->get_base_id(), 'nowatermark');
if ($watermark) {
/** @var BasketElementRepository $repository */
$repository = $this->app['repo.basket-elements'];
if (count($repository->findReceivedValidationElementsByRecord($record, $this->authentication->getUser())) > 0) {