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

Merge pull request #3619 from alchemy-fr/PHRAS-3174_api-v3-records_4.1

Browse Source 
PHRAS-3174_api-v3-records_4.1
This commit is contained in:
jygaulier
2020-09-29 20:22:25 +02:00
committed by GitHub
parent 07e28010ba 4da47a7908
commit aaec2ada31
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Alchemy/Phrasea/Controller/Api/V3/V3SearchController.php
View File

@@ -139,6 +139,8 @@ class V3SearchController extends Controller
// if ($request->get('search_type') != SearchEngineOptions::RECORD_STORY) { // if ($request->get('search_type') != SearchEngineOptions::RECORD_STORY) {
if(in_array('results.stories.children', $includes)) { if(in_array('results.stories.children', $includes)) {
$includes = array_merge($includes, [ $includes = array_merge($includes, [
'results.stories.caption',
'results.stories.metadata',
'results.stories.children.subdefs', 'results.stories.children.subdefs',
'results.stories.children.metadata', 'results.stories.children.metadata',
'results.stories.children.caption', 'results.stories.children.caption',
@@ -146,7 +148,9 @@ class V3SearchController extends Controller
]); ]);
} }
else { else {
$includes = [ 'results.stories.caption' ]; $includes = array_merge($includes, [
'results.stories.caption'
]);
} }
$includes = array_merge($includes, [ $includes = array_merge($includes, [
@@ -265,7 +269,7 @@ class V3SearchController extends Controller
$allChildren[$index] = $childrenView->getRecord(); $allChildren[$index] = $childrenView->getRecord();
} }
$names = in_array('results.stories.records.subdefs', $includes, true) ? null : ['thumbnail']; $names = in_array('results.stories.children.subdefs', $includes, true) ? null : ['thumbnail'];
$subdefViews = $this->buildSubdefsViews($allChildren, $names, $urlTTL); $subdefViews = $this->buildSubdefsViews($allChildren, $names, $urlTTL);
$technicalDatasets = $this->app['service.technical_data']->fetchRecordsTechnicalData($allChildren); $technicalDatasets = $this->app['service.technical_data']->fetchRecordsTechnicalData($allChildren);
@@ -274,7 +278,7 @@ class V3SearchController extends Controller
$recordView->setTechnicalDataView(new TechnicalDataView($technicalDatasets[$index])); $recordView->setTechnicalDataView(new TechnicalDataView($technicalDatasets[$index]));
} }
if (array_intersect($includes, ['results.stories.records.metadata', 'results.stories.records.caption'])) { if (array_intersect($includes, ['results.stories.children.metadata', 'results.stories.children.caption'])) {
$captions = $this->app['service.caption']->findByReferenceCollection($allChildren); $captions = $this->app['service.caption']->findByReferenceCollection($allChildren);
$canSeeBusiness = $this->retrieveSeeBusinessPerDatabox($allChildren); $canSeeBusiness = $this->retrieveSeeBusinessPerDatabox($allChildren);