From bcd067d59e8f2fa5ef75d16f0ba9e37fc9ea2c61 Mon Sep 17 00:00:00 2001 From: "stephen@cubedesigners.com" Date: Mon, 8 Jul 2019 12:44:09 +0000 Subject: [PATCH] Done #2873 @0.25 --- .../views/helpers/CategoriesFilter.php | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/framework/application/views/helpers/CategoriesFilter.php b/framework/application/views/helpers/CategoriesFilter.php index b5711ce..855fd5e 100644 --- a/framework/application/views/helpers/CategoriesFilter.php +++ b/framework/application/views/helpers/CategoriesFilter.php @@ -33,20 +33,29 @@ class Cubedesigners_View_Helper_CategoriesFilter extends CubeIT_View_Helper_Abst $query = $select->query(); - $categories = [ - '' => __('Choisir un domaine...'), - '0' => __('Tout voir') - ]; + $populated_categories = []; while ($row = $query->fetch()) { $row = CubeIT_Util_Cms::unserialize($row); foreach ($row->categories as $category) { - $categories[$category] = $all_categories[$category]->name; + $populated_categories[$category] = $all_categories[$category]->name; } } + // Sort final list of categories based on proper order from admin + $sorted_categories = [ + '' => __('Choisir un domaine...'), + '0' => __('Tout voir') + ]; + // $all_categories is already sorted correctly so we'll use that to build the final list + foreach ($all_categories as $category_ID => $category) { + if (isset($populated_categories[$category_ID])) { + $sorted_categories[$category_ID] = $category->name; + } + } + return $this->formSelect( $listID . '-filter', // Select element's name null, // Value @@ -57,7 +66,7 @@ class Cubedesigners_View_Helper_CategoriesFilter extends CubeIT_View_Helper_Abst 'data-column-width' => $columnWidth, 'data-gutter' => $gutterSize ], - $categories // Options + $sorted_categories // Options ); } -- 2.39.5