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

do the pagination for all accept header

Browse Source
This commit is contained in:
aina-esokia
2018-10-26 18:12:07 +04:00
parent b407a17bdf
commit 17800bc33c
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Alchemy/Phrasea/Controller/Api/V1Controller.php
View File

@@ -1180,7 +1180,7 @@ class V1Controller extends Controller
$result, $result,
$includeResolver->resolve($fractal), $includeResolver->resolve($fractal),
$this->resolveSubdefUrlTTL($request), $this->resolveSubdefUrlTTL($request),
$this->getStorieMaxItems($request) (int)$request->get('story_max_items')?:10
); );
$ret = $fractal->createData(new Item($searchView, $searchTransformer))->toArray(); $ret = $fractal->createData(new Item($searchView, $searchTransformer))->toArray();
@@ -1354,21 +1354,6 @@ class V1Controller extends Controller
return $resultView; return $resultView;
} }
/**
* @param Request $request
* @return int|null
*/
private function getStorieMaxItems(Request $request)
{
$story_max_items = null;
if($request->getAcceptableContentTypes() == V1::$extendedContentTypes['json']){
$story_max_items = (int)$request->get('story_max_items')?:10;
}
return $story_max_items;
}
/** /**
* @param SearchEngineResult $result * @param SearchEngineResult $result
* @param string[] $includes * @param string[] $includes
@@ -1649,14 +1634,10 @@ class V1Controller extends Controller
return Result::createError($request, 404, 'Story not found')->createResponse(); return Result::createError($request, 404, 'Story not found')->createResponse();
} }
$offset = 0; $max_items = (int)$request->get('max_items')?:10;
$max_items = null; $page = (int)$request->get('page')?:1;
if($request->getAcceptableContentTypes() == V1::$extendedContentTypes['json']){
$max_items = (int)$request->get('max_items')?:10;
$page = (int)$request->get('page')?:1;
$offset = $max_items * ($page - 1) + 1; $offset = $max_items * ($page - 1) + 1;
}
$caption = $story->get_caption(); $caption = $story->get_caption();