From 374b730212fa688f32d224411a5b352239d32046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= Date: Mon, 11 Jan 2016 15:50:23 +0100 Subject: [PATCH] rename getMetaDatas to getMetaData --- .../Controller/PermalinkController.php | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/PermalinkController.php b/lib/Alchemy/Phrasea/Controller/PermalinkController.php index dd9a963114..540108380a 100644 --- a/lib/Alchemy/Phrasea/Controller/PermalinkController.php +++ b/lib/Alchemy/Phrasea/Controller/PermalinkController.php @@ -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); + } }