Fixes #40729

BrunoSpy · May 13, 2020 · 70eece8 · 70eece8
1 parent cb9c75e
commit 70eece8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/module/Application/public/assets/js/jquery.ui.timeline.js b/module/Application/public/assets/js/jquery.ui.timeline.js
@@ -1552,8 +1552,13 @@
                 var catid = value.id;
                 $.getJSON(url + '/getQuickModels?id='+catid+'&include='+self.options.showOnlyRootCategories+'&cats='+self.options.tabCats, function(data){
                     var txt = '';
-                    $.each(data, function(key, value){
-                        txt += '<p><a class="btn btn-sm use-model" data-id="'+key+'" data-name="'+value+'" title="'+value+'"><span class="pull-left title">'+value+'</span> <span class="pull-right glyphicon glyphicon-share-alt"></span></a></p>';
+                    let res = [];
+                    $.each(data, function(index, value){
+                        res.push(value);
+                    });
+                    res.sort(function(a,b){return a.place - b.place;});
+                    $.each(res, function(index, value){
+                        txt += '<p><a class="btn btn-sm use-model" data-id="'+value.key+'" data-name="'+value.name+'" title="'+value.name+'"><span class="pull-left title">'+value.name+'</span> <span class="pull-right glyphicon glyphicon-share-alt"></span></a></p>';
                     });
                     $("#category"+catid).popover({
                         trigger: 'focus',

diff --git a/module/Application/src/Repository/PredefinedEventRepository.php b/module/Application/src/Repository/PredefinedEventRepository.php
@@ -92,8 +92,10 @@ public function getQuickAccessModelsFromCategoryAsArray(Category $category, $cat
             'place' => 'ASC'
         ));
         $list = parent::matching($criteria);
+        $place = 0;
         foreach ($list as $element) {
-            $res[$element->getId()] = $element->getName();
+            $res[] = array("place" => $place, "key" => $element->getId(), "name" => $element->getName());
+            $place++;
         }
         if($cats !== null) {
             foreach ($category->getChildren() as $cat) {
@@ -106,7 +108,8 @@ public function getQuickAccessModelsFromCategoryAsArray(Category $category, $cat
                     ));
                     $list = parent::matching($criteria);
                     foreach ($list as $element) {
-                        $res[$element->getId()] = $element->getName();
+                        $res[] = array("place" => $place, "key" => $element->getId(), "name" => $element->getName());
+                        $place++;
                     }
                 }
             }

diff --git a/module/Application/view/application/events/subform.phtml b/module/Application/view/application/events/subform.phtml
@@ -16,13 +16,19 @@ switch ($this->part) {
             echo '<p>Aucun modèle défini.</p>';
             echo '</div>';
         } else {
+            $count = 0;
+            if(!empty($this->values)) {
+                $count += count($this->values);
+            }
+            if(!empty($this->subvalues)) {
+                $count += count($this->subvalues);
+            }
+            $i = 1;
+            $separated = false;
+            echo '<div class="col-md-6">';
+            echo '<table>';
+            echo '<tbody>';
             if(!empty($this->values)) {
-                echo '<div class="col-md-6">';
-                echo '<table>';
-                echo '<tbody>';
-                $count = count($this->values);
-                $i = 1;
-                $separated = false;
                 foreach ($this->values as $key => $value) {
                     echo '<tr>';
                     echo '<td class="hidden-xs">';
@@ -43,17 +49,8 @@ switch ($this->part) {
                     }
                     $i ++;
                 }
-                echo '</tbody>';
-                echo '</table>';
-                echo '</div>';
             }
             if(!empty($this->subvalues)) {
-                echo '<div class="col-md-6">';
-                echo '<table>';
-                echo '<tbody>';
-                $count = count($this->subvalues);
-                $i = 0;
-                $separated = false;
                 foreach ($this->subvalues as $key => $value) {
                     echo '<tr>';
                     echo '<td class="hidden-xs">';
@@ -74,10 +71,11 @@ switch ($this->part) {
                     }
                     $i ++;
                 }
-                echo '</tbody>';
-                echo '</table>';
-                echo '</div>';
+
             }
+            echo '</tbody>';
+            echo '</table>';
+            echo '</div>';
         }
         break;
     case 'custom_fields':