fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-4131 (pull request #8721)

Browse Source 
PMCORE-4131

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2023-02-13 16:57:41 +00:00
committed by Julio Cesar Laura Avendaño
parent 85cc9f5617 dcae7ef349
commit 19f077b754
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/methods/groups/groups_Ajax.php
View File

@@ -54,32 +54,25 @@ switch ($_POST['action']) {
$start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0; $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
$limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size; $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;
$filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : ''; $filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';
$sortField = isset($_REQUEST["sort"]) ? $_REQUEST["sort"] : ""; $sortField = isset($_REQUEST["sort"]) ? $_REQUEST["sort"] : "";
$sortDir = isset($_REQUEST["dir"]) ? $_REQUEST["dir"] : ""; $sortDir = isset($_REQUEST["dir"]) ? $_REQUEST["dir"] : "";
global $RBAC; global $RBAC;
$tasks = new TaskUser(); $tasks = new TaskUser();
$aTask = $tasks->getCountAllTaksByGroups(); $task = $tasks->getCountAllTaksByGroups();
require_once PATH_CONTROLLERS . 'adminProxy.php'; require_once PATH_CONTROLLERS . 'adminProxy.php';
$uxList = adminProxy::getUxTypesList(); $uxList = adminProxy::getUxTypesList();
$data = $groupWf->getAllGroup($start, $limit, $filter, $sortField, $sortDir, true); $data = $groupWf->getAllGroup($start, $limit, $filter, $sortField, $sortDir, true);
$result = $data['rows']; $result = $data['rows'];
$totalRows = 0; $totalRows = 0;
$arrData = array(); $arrData = [];
foreach ($result as $results) { foreach ($result as $results) {
$totalRows++; $totalRows++;
$results['CON_VALUE'] = str_replace(array("<", ">" $results['CON_VALUE'] = str_replace(["<", ">"], ["&lt;", "&gt;"], $results['GRP_TITLE']);
), array("&lt;", "&gt;" $results['GRP_TASKS'] = isset($task[$results['GRP_UID']]) ? $task[$results['GRP_UID']] : 0;
), $results['GRP_TITLE']);
$results['GRP_TASKS'] = isset($aTask[$results['GRP_UID']]) ? $aTask[$results['GRP_UID']] : 0;
$arrData[] = $results; $arrData[] = $results;
} }
$result = new StdClass(); $result = new StdClass();
$result->success = true; $result->success = true;
$result->groups = $arrData; $result->groups = $arrData;

10
workflow/engine/templates/groups/groupsList.js
View File

@@ -411,14 +411,16 @@ NewGroupWindow = function(){
}; };
//Load Grid By Default //Load Grid By Default
GridByDefault = function(){ GridByDefault = function () {
searchText.reset(); searchText.reset();
infoGrid.store.load(); store.setBaseParam('textFilter', '');
store.load();
}; };
//Do Search Function //Do Search Function
DoSearch = function(){ DoSearch = function () {
infoGrid.store.load({params: {textFilter: searchText.getValue()}}); store.setBaseParam('textFilter', searchText.getValue());
store.load();
}; };
//Close Popup Window //Close Popup Window