joomla
/
cms
mirror of https://github.com/joomla/joomla-cms.git
29
0
Fork 0
Code Packages Releases Activity

[4.4] Smart Search: Properly sort filters (#42835) 

* Smart Search: Properly sort filters

* Update administrator/components/com_finder/src/Service/HTML/Filter.php

Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>

---------

Co-authored-by: Martin Carl Kopp <6154099+MacJoom@users.noreply.github.com>
Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com>
This commit is contained in:
Hannes Papenberg 2024-03-05 08:19:13 +01:00 committed by GitHub
parent 0a912a8d4f
commit ab3d32cb17
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
administrator/components/com_finder/src/Service/HTML/Filter.php
View File

@ -297,7 +297,7 @@ class Filter
->where('t.rgt < :rgt')
->where('t.state = 1')
->whereIn('t.access', $user->getAuthorisedViewLevels())
->order('t.title')
->order('t.level, t.parent_id, t.title')
->bind(':lft', $bv->lft, ParameterType::INTEGER)
->bind(':rgt', $bv->rgt, ParameterType::INTEGER);
@ -327,6 +327,7 @@ class Filter
// Translate branch nodes if possible.
$language = Factory::getLanguage();
$root = [];
foreach ($branches[$bk]->nodes as $node_id => $node) {
if (trim($node->parent_title, '*') === 'Language') {
@ -340,9 +341,19 @@ class Filter
$branches[$bk]->nodes[$node_id]->title = str_repeat('-', $node->level - 2) . $title;
} else {
$branches[$bk]->nodes[$node_id]->title = $title;
$root[] = $branches[$bk]->nodes[$node_id];
}
if ($node->parent_id && isset($branches[$bk]->nodes[$node->parent_id])) {
if (!isset($branches[$bk]->nodes[$node->parent_id]->children)) {
$branches[$bk]->nodes[$node->parent_id]->children = [];
}
$branches[$bk]->nodes[$node->parent_id]->children[] = $node;
}
}
$branches[$bk]->nodes = $this->reduce($root);
// Add the Search All option to the branch.
array_unshift($branches[$bk]->nodes, ['id' => null, 'title' => Text::_('COM_FINDER_FILTER_SELECT_ALL_LABEL')]);
}
@ -487,4 +498,27 @@ class Filter
return $html;
}
/**
* Method to flatten a tree to a sorted array
*
* @param \stdClass[] $array
*
* @return \stdClass[] Flat array of all nodes of a tree with the children after each parent
*
* @since __DEPLOY_VERSION__
*/
private function reduce(array $array)
{
$return = [];
foreach ($array as $item) {
$return[] = $item;
if (isset($item->children)) {
$return = array_merge($return, $this->reduce($item->children));
}
}
return $return;
}
}