mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-17 15:03:25 +00:00
rename getMetaDatas to getMetaData
This commit is contained in:
@@ -70,27 +70,12 @@ class PermalinkController extends AbstractDelivery
|
|||||||
return $this->doDeliverPermaview($sbas_id, $record_id, $request->query->get('token'), $subdef);
|
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)
|
private function doDeliverPermaview($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->getMetaDatas($record, $subdefName);
|
$metaDatas = $this->mediaService->getMetaData($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', [
|
||||||
@@ -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)
|
private function doDeliverPermalink(Request $request, $sbas_id, $record_id, $token, $subdef)
|
||||||
{
|
{
|
||||||
$databox = $this->mediaService->getDatabox($sbas_id);
|
$databox = $this->mediaService->getDatabox($sbas_id);
|
||||||
@@ -165,4 +160,9 @@ class PermalinkController extends AbstractDelivery
|
|||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function deliverPermalinkOldWay(Request $request, $sbas_id, $record_id, $token, $subdef)
|
||||||
|
{
|
||||||
|
return $this->doDeliverPermalink($request, $sbas_id, $record_id, $token, $subdef);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user