From dcae7ef349a796df15ffaa24346dbf6f1dfddbc1 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Mon, 13 Feb 2023 11:50:13 -0400
Subject: [PATCH] PMCORE-4131

---
 workflow/engine/methods/groups/groups_Ajax.php | 15 ++++-----------
 workflow/engine/templates/groups/groupsList.js | 10 ++++++----
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/workflow/engine/methods/groups/groups_Ajax.php b/workflow/engine/methods/groups/groups_Ajax.php
index 4da61b888..c05b274bb 100644
--- a/workflow/engine/methods/groups/groups_Ajax.php
+++ b/workflow/engine/methods/groups/groups_Ajax.php
@@ -54,32 +54,25 @@ switch ($_POST['action']) {
         $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
         $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
         $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
-
         $sortField = isset($_REQUEST["sort"]) ? $_REQUEST["sort"] : "";
         $sortDir = isset($_REQUEST["dir"]) ? $_REQUEST["dir"] : "";
 
         global $RBAC;
-
         $tasks = new TaskUser();
-        $aTask = $tasks->getCountAllTaksByGroups();
+        $task = $tasks->getCountAllTaksByGroups();
 
         require_once PATH_CONTROLLERS . 'adminProxy.php';
         $uxList = adminProxy::getUxTypesList();
-
         $data = $groupWf->getAllGroup($start, $limit, $filter, $sortField, $sortDir, true);
         $result = $data['rows'];
-
         $totalRows = 0;
-        $arrData = array();
+        $arrData = [];
         foreach ($result as $results) {
             $totalRows++;
-            $results['CON_VALUE'] = str_replace(array("<", ">"
-            ), array("&lt;", "&gt;"
-            ), $results['GRP_TITLE']);
-            $results['GRP_TASKS'] = isset($aTask[$results['GRP_UID']]) ? $aTask[$results['GRP_UID']] : 0;
+            $results['CON_VALUE'] = str_replace(["<", ">"], ["&lt;", "&gt;"], $results['GRP_TITLE']);
+            $results['GRP_TASKS'] = isset($task[$results['GRP_UID']]) ? $task[$results['GRP_UID']] : 0;
             $arrData[] = $results;
         }
-
         $result = new StdClass();
         $result->success = true;
         $result->groups = $arrData;
diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js
index 3b38a6d4e..247540c89 100644
--- a/workflow/engine/templates/groups/groupsList.js
+++ b/workflow/engine/templates/groups/groupsList.js
@@ -411,14 +411,16 @@ NewGroupWindow = function(){
 };
 
 //Load Grid By Default
-GridByDefault = function(){
+GridByDefault = function () {
   searchText.reset();
-  infoGrid.store.load();
+  store.setBaseParam('textFilter', '');
+  store.load();
 };
 
 //Do Search Function
-DoSearch = function(){
-  infoGrid.store.load({params: {textFilter: searchText.getValue()}});
+DoSearch = function () {
+  store.setBaseParam('textFilter', searchText.getValue());
+  store.load();
 };
 
 //Close Popup Window