Fix hierarchy filter in some cases

2 years ago · 7d3710ba43
parent 065973249c
commit 7d3710ba43
1 changed files with 3 additions and 3 deletions
--- a/main/inc/lib/career.lib.php
+++ b/main/inc/lib/career.lib.php
@ -110,9 +110,6 @@ class Career extends Model
        $orderedCareers = [];
        $filterAux = [];
        foreach ($careers as &$career) {
-            if (!empty($filterId) && $career['id'] == $filterId) {
-                $filterAux[] = $career;
-            }
            if (is_null($career['parent_id'])) {
                $orderedCareers[] = &$career;
            } else {
@ -127,6 +124,9 @@ class Career extends Model
                    $careers[$pid]['children'][] = &$career;
                }
            }
+            if (!empty($filterId) && $career['id'] == $filterId) {
+                $filterAux[0] = &$career;
+            }
        }

        return !empty($filterId) ? $filterAux : $orderedCareers;