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

Merge pull request #2535 from KallooaSan/PHRAS-1911_fix_fields_structure

Browse Source 
PHRAS-1911 fix fields structure
This commit is contained in:
Nicolas Maillat
2018-04-20 16:42:56 +02:00
committed by GitHub
parent 2f81390abe 9961362d30
commit 8a8577c59e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2689,7 +2689,7 @@ class V1Controller extends Controller
{ {
$ret = [ $ret = [
"meta_fields" => $this->listUserAuthorizedMetadataFields($this->getAuthenticatedUser()), "meta_fields" => $this->listUserAuthorizedMetadataFields($this->getAuthenticatedUser()),
"aggregable_fields" => $this->buildUserFieldList(ElasticsearchOptions::getAggregableTechnicalFields()), "aggregable_fields" => $this->buildUserFieldList(ElasticsearchOptions::getAggregableTechnicalFields(), ['choices']),
"technical_fields" => $this->buildUserFieldList(media_subdef::getTechnicalFieldsList()), "technical_fields" => $this->buildUserFieldList(media_subdef::getTechnicalFieldsList()),
]; ];
@@ -2753,9 +2753,10 @@ class V1Controller extends Controller
/** /**
* Build the aggregable/technical fields array * Build the aggregable/technical fields array
* @param array $fields * @param array $fields
* @param array $excludes
* @return array * @return array
*/ */
private function buildUserFieldList(array $fields) private function buildUserFieldList(array $fields, array $excludes = [])
{ {
$ret = []; $ret = [];
@@ -2763,6 +2764,10 @@ class V1Controller extends Controller
$data['name'] = $key; $data['name'] = $key;
foreach ($field as $k => $i) { foreach ($field as $k => $i) {
if (in_array($k, $excludes)) {
continue;
}
$data[$k] = $i; $data[$k] = $i;
} }
@@ -2790,6 +2795,7 @@ class V1Controller extends Controller
$opt = []; $opt = [];
$data = [ $data = [
'name' => $sub->get_name(), 'name' => $sub->get_name(),
'databox_id' => $databoxId,
'class' => $sub->get_class(), 'class' => $sub->get_class(),
'preset' => $sub->get_preset(), 'preset' => $sub->get_preset(),
'downloadable' => $sub->isDownloadable(), 'downloadable' => $sub->isDownloadable(),
@@ -2806,7 +2812,7 @@ class V1Controller extends Controller
$opt[$option->getName()] = $option->getValue(); $opt[$option->getName()] = $option->getValue();
} }
$data['options'] = $opt; $data['options'] = $opt;
$ret[$databoxId][$subGroup->getName()][$sub->get_name()] = $data; $ret[$subGroup->getName()][$sub->get_name()] = $data;
} }
} }
} }