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

rename getMetaDatas to getMetaData

Browse Source
This commit is contained in:
Benoît Burnichon
2016-01-11 15:50:23 +01:00
parent 575a30436c
commit 374b730212
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,27 +70,12 @@ class PermalinkController extends AbstractDelivery
return $this->doDeliverPermaview($sbas_id, $record_id, $request->query->get('token'), $subdef);
}
public function deliverPermaviewOldWay($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)
{
return $this->doDeliverPermalink($request, $sbas_id, $record_id, $request->query->get('token'), $subdef);
}
public function deliverPermalinkOldWay(Request $request, $sbas_id, $record_id, $token, $subdef)
{
return $this->doDeliverPermalink($request, $sbas_id, $record_id, $token, $subdef);
}
private function doDeliverPermaview($sbas_id, $record_id, $token, $subdefName)
{
$databox = $this->mediaService->getDatabox($sbas_id);
$record = $this->mediaService->retrieveRecord($databox, $token, $record_id, $subdefName);
$metaDatas = $this->mediaService->getMetaDatas($record, $subdefName);
$metaDatas = $this->mediaService->getMetaData($record, $subdefName);
$subdef = $record->get_subdef($subdefName);
return $this->app['twig']->render('overview.html.twig', [
@@ -104,6 +89,16 @@ class PermalinkController extends AbstractDelivery
]);
}
public function deliverPermaviewOldWay($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)
{
return $this->doDeliverPermalink($request, $sbas_id, $record_id, $request->query->get('token'), $subdef);
}
private function doDeliverPermalink(Request $request, $sbas_id, $record_id, $token, $subdef)
{
$databox = $this->mediaService->getDatabox($sbas_id);
@@ -165,4 +160,9 @@ class PermalinkController extends AbstractDelivery
return $response;
}
public function deliverPermalinkOldWay(Request $request, $sbas_id, $record_id, $token, $subdef)
{
return $this->doDeliverPermalink($request, $sbas_id, $record_id, $token, $subdef);
}
}