From 08fa6ac1512c913405d44599015c1b4b8493a2a1 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@admin.grnet.gr>
Date: Sun, 1 May 2022 13:37:04 +0300
Subject: [PATCH] Fixes required after Filtering feature initial commit

---
 app/src/Lib/Traits/SearchFilterTrait.php | 8 +++++---
 app/src/View/Helper/MenuHelper.php       | 3 ++-
 app/templates/Standard/index.php         | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/Lib/Traits/SearchFilterTrait.php b/app/src/Lib/Traits/SearchFilterTrait.php
index 6a13472f9..dd05c5fe3 100644
--- a/app/src/Lib/Traits/SearchFilterTrait.php
+++ b/app/src/Lib/Traits/SearchFilterTrait.php
@@ -29,6 +29,8 @@
 
 namespace App\Lib\Traits;
 
+use Cake\Utility\Inflector;
+
 trait SearchFilterTrait {
   // Array (and configuration) of permitted search filters
   private $searchFilters = array();
@@ -54,9 +56,9 @@ public function getLabel(string $attribute): string {
     if($l != $attribute) {
       return $l;
     }
-    
-    // If we make it here, just return $attribute
-    return $attribute;
+
+    // If we make it here, just return a pretty version of the $attribute name
+    return Inflector::humanize($attribute);
   }
   
   /**
diff --git a/app/src/View/Helper/MenuHelper.php b/app/src/View/Helper/MenuHelper.php
index 3ac9dd8b6..0752e1052 100644
--- 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;
   }
 
 }
\ No newline at end of file
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index 751378bfc..d602c32e1 100644
--- 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'],