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

Merged in ronald-quentaprocessmaker/processmaker/HOR-1795 (pull request #4871)

Browse Source 
HOR-1795
This commit is contained in:
David Callizaya
2016-09-07 11:33:14 -04:00
parent 8a6e95c743 db002326b2
commit 010b9ba3fa
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/classes/model/Groupwf.php
View File

@@ -323,18 +323,19 @@ class Groupwf extends BaseGroupwf
require_once PATH_RBAC . "model/RbacUsers.php"; require_once PATH_RBAC . "model/RbacUsers.php";
require_once 'classes/model/TaskUser.php'; require_once 'classes/model/TaskUser.php';
require_once 'classes/model/GroupUser.php'; require_once 'classes/model/GroupUser.php';
$sDelimiter = DBAdapter::getStringDelimiter();
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(GroupwfPeer::GRP_UID); $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(GroupwfPeer::GRP_TITLE); $criteria->addSelectColumn(GroupwfPeer::GRP_TITLE);
$criteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$criteria->addSelectColumn(GroupwfPeer::GRP_UX); $criteria->addSelectColumn(GroupwfPeer::GRP_UX);
if (is_null($sortField) || trim($sortField) == "") { if (is_null($sortField) || trim($sortField) == "") {
$sortField = GroupwfPeer::GRP_TITLE; $sortField = GroupwfPeer::GRP_TITLE;
} }
if ($search) {
$criteria->add(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
}
$totalRows = GroupwfPeer::doCount($criteria);
if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") { if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") {
$criteria->addDescendingOrderByColumn($sortField); $criteria->addDescendingOrderByColumn($sortField);
} else { } else {
@@ -349,10 +350,6 @@ class Groupwf extends BaseGroupwf
$criteria->setLimit($limit); $criteria->setLimit($limit);
} }
if ($search) {
$criteria->add(GroupwfPeer::GRP_TITLE, '%' . $search . '%', Criteria::LIKE);
}
$oDataset = GroupwfPeer::doSelectRS($criteria); $oDataset = GroupwfPeer::doSelectRS($criteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$processes = array(); $processes = array();
@@ -363,7 +360,7 @@ class Groupwf extends BaseGroupwf
$groups[] = $oDataset->getRow(); $groups[] = $oDataset->getRow();
} }
return array('rows' => $groups, 'totalCount' => count($groups)); return array('rows' => $groups, 'totalCount' => $totalRows);
} }
public function filterGroup ($filter, $start, $limit) public function filterGroup ($filter, $start, $limit)