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

Remove url_generator from ResourceResolver s

Browse Source
This commit is contained in:
Benoît Burnichon
2016-01-13 16:56:59 +01:00
parent 7713afeff6
commit a69ac51114
5 changed files with 35 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@
namespace Alchemy\Phrasea\Controller;
use Alchemy\Embed\Media\Media;
use Alchemy\Embed\Media\MediaInformation;
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Application\Helper\ApplicationBoxAware;
use Alchemy\Phrasea\Authentication\ACLProvider;
@@ -70,17 +71,28 @@ class PermalinkController extends AbstractDelivery
public function deliverPermaview(Request $request, $sbas_id, $record_id, $subdef)
{
return $this->doDeliverPermaview($request, $sbas_id, $record_id, $request->query->get('token'), $subdef);
return $this->doDeliverPermaview($sbas_id, $record_id, $request->query->get('token'), $subdef);
}
private function doDeliverPermaview(Request $request, $sbas_id, $record_id, $token, $subdefName)
private function doDeliverPermaview($sbas_id, $record_id, $token, $subdefName)
{
$databox = $this->findDataboxById($sbas_id);
$record = $this->retrieveRecord($databox, $token, $record_id, $subdefName);
$metaData = $this->mediaService->getMetaData($request, $record, $subdefName);
$subdef = $record->get_subdef($subdefName);
$information = $this->mediaService->createMediaInformationFromResourceAndRoute(
$subdef,
'permalinks_permalink',
[
'sbas_id' => $sbas_id,
'record_id' => $record_id,
'subdef' => $subdefName,
'label' => $record->get_title(),
'token' => $token,
]
);
$metaData = $this->mediaService->getMetaData($information);
return $this->app['twig']->render('overview.html.twig', [
'ogMetaData' => $metaData['ogMetaData'],
'subdef' => $subdef,
@@ -89,19 +101,13 @@ class PermalinkController extends AbstractDelivery
'view' => 'overview',
'token' => $token,
'record' => $record,
'recordUrl' => $this->app->url('permalinks_permalink', [
'sbas_id' => $sbas_id,
'record_id' => $record_id,
'subdef' => $subdefName,
'label' => $record->get_title(),
'token' => $token,
])
'recordUrl' => $information->getUrl(),
]);
}
public function deliverPermaviewOldWay(Request $request, $sbas_id, $record_id, $token, $subdef)
{
return $this->doDeliverPermaview($request, $sbas_id, $record_id, $token, $subdef);
return $this->doDeliverPermaview($sbas_id, $record_id, $token, $subdef);
}
public function deliverPermalink(Request $request, $sbas_id, $record_id, $subdef)