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

add request to parameters

Browse Source
This commit is contained in:
Benoît Burnichon
2016-01-11 16:34:44 +01:00
parent 374b730212
commit fa3fbca61f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,19 +67,19 @@ class PermalinkController extends AbstractDelivery
public function deliverPermaview(Request $request, $sbas_id, $record_id, $subdef) public function deliverPermaview(Request $request, $sbas_id, $record_id, $subdef)
{ {
return $this->doDeliverPermaview($sbas_id, $record_id, $request->query->get('token'), $subdef); return $this->doDeliverPermaview($request, $sbas_id, $record_id, $request->query->get('token'), $subdef);
} }
private function doDeliverPermaview($sbas_id, $record_id, $token, $subdefName) private function doDeliverPermaview(Request $request, $sbas_id, $record_id, $token, $subdefName)
{ {
$databox = $this->mediaService->getDatabox($sbas_id); $databox = $this->mediaService->getDatabox($sbas_id);
$record = $this->mediaService->retrieveRecord($databox, $token, $record_id, $subdefName); $record = $this->mediaService->retrieveRecord($databox, $token, $record_id, $subdefName);
$metaDatas = $this->mediaService->getMetaData($record, $subdefName); $metaData = $this->mediaService->getMetaData($request, $record, $subdefName);
$subdef = $record->get_subdef($subdefName); $subdef = $record->get_subdef($subdefName);
return $this->app['twig']->render('overview.html.twig', [ return $this->app['twig']->render('overview.html.twig', [
'ogMetaDatas' => $metaDatas['ogMetaDatas'], 'ogMetaData' => $metaData['ogMetaData'],
'subdef' => $subdef, 'subdef' => $subdef,
'module_name' => 'overview', 'module_name' => 'overview',
'module' => 'overview', 'module' => 'overview',
@@ -89,9 +89,9 @@ class PermalinkController extends AbstractDelivery
]); ]);
} }
public function deliverPermaviewOldWay($sbas_id, $record_id, $token, $subdef) public function deliverPermaviewOldWay(Request $request, $sbas_id, $record_id, $token, $subdef)
{ {
return $this->doDeliverPermaview($sbas_id, $record_id, $token, $subdef); return $this->doDeliverPermaview($request, $sbas_id, $record_id, $token, $subdef);
} }
public function deliverPermalink(Request $request, $sbas_id, $record_id, $subdef) public function deliverPermalink(Request $request, $sbas_id, $record_id, $subdef)

2
templates/web/overview.html.twig
View File

@@ -12,7 +12,7 @@
{% endblock %} {% endblock %}
{% block rss %} {% block rss %}
{% for metaKey, metaValue in ogMetaDatas %} {% for metaKey, metaValue in ogMetaData %}
<meta property="{{ metaKey }}" content="{{ metaValue }}" /> <meta property="{{ metaKey }}" content="{{ metaValue }}" />
{% endfor %} {% endfor %}
{% endblock %} {% endblock %}