Fixes required after Filtering feature initial commit

COmanage · May 1, 2022 · 67ac095 · 67ac095
1 parent 9b995a6
commit 67ac095
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/src/View/Helper/MenuHelper.php b/app/src/View/Helper/MenuHelper.php
@@ -80,7 +80,8 @@ public function getMenuIcon($action) {
       'Delete'        =>  'delete'
     );
 
-    return $icon[$action];
+    // For the actions with Default order we can pass directly the name of the icon
+    return $icon[$action] ?? $action;
   }
 
 }
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
@@ -122,7 +122,7 @@ function _column_key($modelsName, $c, $tz=null) {
         }
 
         $action_args['vv_actions'][] = [
-          'order' => $this->Menu->getMenuOrder($t['icon']),
+          'order' => $this->Menu->getMenuOrder($t['order']),
           'icon' => $this->Menu->getMenuIcon($t['icon']),
           'url' => $this->Url->build($t['link']),
           'label' => $t['label'],