The categories ancestors are displayed in the wrong order when there …

…are disabled for child entities. see #5409
glpi-project · Jul 10, 2015 · f7b0090 · f7b0090
1 parent 9c5e40a
commit f7b0090
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ajax/getDropdownValue.php b/ajax/getDropdownValue.php
@@ -320,7 +320,7 @@
 
                      $work_level    = $level-1;
                      $work_parentID = $data[$item->getForeignKeyField()];
-
+                     $parent_datas  = array();
                      do {
                         // Get parent
                         if ($item->getFromDB($work_parentID)) {
@@ -350,7 +350,7 @@
                               if ($_GET['permit_select_parent']) {
                                  unset($temp['disabled']);
                               }
-                              array_push($datastoadd, $temp);
+                              array_unshift($parent_datas, $temp);
                            }
                            $last_level_displayed[$work_level] = $item->fields['id'];
                            $work_level--;
@@ -363,7 +363,10 @@
                      } while (($work_level >= 1)
                               && (!isset($last_level_displayed[$work_level])
                                   || ($last_level_displayed[$work_level] != $work_parentID)));
-
+                     // Add parents
+                     foreach($parent_datas as $val){
+                        array_push($datastoadd, $val);
+                     }
                   }
                }
                $last_level_displayed[$level] = $data['id'];