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

Merge branch 'master' into PHRAS-2562-multistage

Browse Source
This commit is contained in:
Nicolas Maillat
2019-05-16 11:29:24 +02:00
committed by GitHub
parent f5af760e86 cf5a47797c
commit 69862ee289
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,10 +74,10 @@ 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($sbas_id, $record_id, $request->query->get('token'), $subdef, $request->query->get('t'));
} }
private function doDeliverPermaview($sbas_id, $record_id, $token, $subdefName) private function doDeliverPermaview($sbas_id, $record_id, $token, $subdefName, $currentTime = null)
{ {
$databox = $this->findDataboxById($sbas_id); $databox = $this->findDataboxById($sbas_id);
$record = $this->retrieveRecord($databox, $token, $record_id, $subdefName); $record = $this->retrieveRecord($databox, $token, $record_id, $subdefName);
@@ -105,6 +105,7 @@ class PermalinkController extends AbstractDelivery
'token' => $token, 'token' => $token,
'record' => $record, 'record' => $record,
'recordUrl' => $information->getUrl(), 'recordUrl' => $information->getUrl(),
'currentTime' => $currentTime
]); ]);
} }

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

@@ -36,7 +36,7 @@
lang: "{{ app.locale }}", lang: "{{ app.locale }}",
baseUrl: '{{ app['request'].getUriForPath('/') }}', baseUrl: '{{ app['request'].getUriForPath('/') }}',
basePath: '{{ app.request.basePath|e('js') }}', basePath: '{{ app.request.basePath|e('js') }}',
recordUrl: '{{ url('alchemy_embed_view', {url: recordUrl|trim, autoplay: autoplay|default('false') }) }}', recordUrl: '{{ url('alchemy_embed_view', {url: recordUrl|trim, autoplay: autoplay|default('false'), t: currentTime|trim }) | e('js')}}',
debug: {% if app.debug == true %}true{% else %}false{% endif %} debug: {% if app.debug == true %}true{% else %}false{% endif %}
}); });
</script> </script>