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

update V1Controller

Browse Source
This commit is contained in:
aina-esokia
2018-09-13 10:37:35 +04:00
parent e9beafef85
commit a76c971ab1
1 changed files with 18 additions and 9 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),
$request $this->getStorieMaxItems($request)
); );
$ret = $fractal->createData(new Item($searchView, $searchTransformer))->toArray(); $ret = $fractal->createData(new Item($searchView, $searchTransformer))->toArray();
@@ -1235,10 +1235,10 @@ class V1Controller extends Controller
* @param SearchEngineResult $result * @param SearchEngineResult $result
* @param string[] $includes * @param string[] $includes
* @param int $urlTTL * @param int $urlTTL
* @param Request $request * @param int|null $storie_max_items
* @return SearchResultView * @return SearchResultView
*/ */
private function buildSearchView(SearchEngineResult $result, array $includes, $urlTTL, Request $request) private function buildSearchView(SearchEngineResult $result, array $includes, $urlTTL, $storie_max_items = null)
{ {
$references = new RecordReferenceCollection($result->getResults()); $references = new RecordReferenceCollection($result->getResults());
@@ -1256,12 +1256,6 @@ class V1Controller extends Controller
$resultView = new SearchResultView($result); $resultView = new SearchResultView($result);
if ($stories->count() > 0) { if ($stories->count() > 0) {
$storie_max_items = null;
if($request->getAcceptableContentTypes() == V1::$extendedContentTypes['json']){
$storie_max_items = (int)$request->get('storie_max_items')?:10;
}
$user = $this->getAuthenticatedUser(); $user = $this->getAuthenticatedUser();
$children = []; $children = [];
@@ -1360,6 +1354,21 @@ class V1Controller extends Controller
return $resultView; return $resultView;
} }
/**
* @param Request $request
* @return int|null
*/
private function getStorieMaxItems(Request $request)
{
$storie_max_items = null;
if($request->getAcceptableContentTypes() == V1::$extendedContentTypes['json']){
$storie_max_items = (int)$request->get('storie_max_items')?:10;
}
return $storie_max_items;
}
/** /**
* @param SearchEngineResult $result * @param SearchEngineResult $result
* @param string[] $includes * @param string[] $includes