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

fix bad merge happened cause last rebase (?)

Browse Source
This commit is contained in:
Jean-Yves Gaulier
2020-02-10 21:15:02 +01:00
parent eeec1ab716
commit 4f7be4c0a9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
View File

@@ -76,7 +76,7 @@ class ElasticsearchOptions
$self->setPopulateOrder($options['populate_order']); $self->setPopulateOrder($options['populate_order']);
$self->setPopulateDirection($options['populate_direction']); $self->setPopulateDirection($options['populate_direction']);
$self->setActiveTab($options['activeTab']); $self->setActiveTab($options['activeTab']);
foreach($options['aggregates'] as $fieldname=>$attributes) { foreach($options['facets'] as $fieldname=>$attributes) {
$self->setAggregableField($fieldname, $attributes); $self->setAggregableField($fieldname, $attributes);
} }
@@ -99,7 +99,7 @@ class ElasticsearchOptions
'populate_order' => $this->populateOrder, 'populate_order' => $this->populateOrder,
'populate_direction' => $this->populateDirection, 'populate_direction' => $this->populateDirection,
'activeTab' => $this->activeTab, 'activeTab' => $this->activeTab,
'aggregates' => [] 'facets' => []
]; ];
foreach($this->getAggregableFields() as $fieldname=>$attributes) { foreach($this->getAggregableFields() as $fieldname=>$attributes) {
$ret['facets'][$fieldname] = $attributes; $ret['facets'][$fieldname] = $attributes;