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

Remove remaining calls to getFieldsStructure()

Browse Source
This commit is contained in:
Mathieu Darse
2015-05-26 17:03:46 +02:00
parent 1e4669c122
commit b14c845811
1 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticSearchEngine.php
View File

@@ -369,51 +369,19 @@ class ElasticSearchEngine implements SearchEngineInterface
private function getAggregationQueryParams(SearchEngineOptions $options) private function getAggregationQueryParams(SearchEngineOptions $options)
{ {
// get business field access rights for current user
$allowed_databoxes = [];
$acl = $this->app['acl']->get($this->app['authentication']->getUser());
foreach ($options->getDataboxes() as $databox) {
$id = $databox->get_sbas_id();
if ($acl->can_see_business_fields($databox)) {
$allowed_databoxes[] = $id;
}
}
$aggs = []; $aggs = [];
// We always a collection facet right now // We always want a collection facet right now
$collection_facet_agg = array(); $collection_facet_agg = array();
$collection_facet_agg['terms']['field'] = 'collection_name'; $collection_facet_agg['terms']['field'] = 'collection_name';
$aggs['Collection'] = $collection_facet_agg; $aggs['Collection'] = $collection_facet_agg;
foreach ($this->recordHelper->getFieldsStructure() as $field_name => $params) { foreach ($this->structure->getFacetFields() as $name => $field) {
// skip if field is not searchable or not aggregated $prefix = $field->isPrivate() ? 'private_caption' : 'caption';
if (!$params['searchable'] || !$params['to_aggregate']) { // 2015-05-26 (mdarse) Removed databox filtering.
continue; // It was already done by the ACL filter in the query scope, so no
} // document that shouldn't be displayed can go this far.
$aggs[$name]['terms']['field'] = sprintf('%s.%s.raw', $prefix, $name);
if ($params['private']) {
// restrict access to authorized databoxes
$databoxes = array_intersect($params['databox_ids'], $allowed_databoxes);
$prefix = 'private_caption';
} else {
$databoxes = $params['databox_ids'];
$prefix = 'caption';
}
// filter aggregation to allowed databoxes
// declare aggregation on current field
$agg = array();
// TODO (mdarse) Remove databox filtering. It's already done by the
// ACL filter in the query scope, so no document that shouldn't be
// displayed can go this far.
// // array_values is needed to ensure array serialization
// $agg['filter']['terms']['databox_id'] = array_values($databoxes);
// $agg['aggs']['distinct_occurrence']['terms']['field'] =
$agg['terms']['field'] =
sprintf('%s.%s.raw', $prefix, $field_name);
$aggs[$field_name] = $agg;
} }
return $aggs; return $aggs;