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

Merged in gproly/processmaker/HOR-1086 (pull request #4341)

Browse Source 
HOR-1086
This commit is contained in:
Julio Cesar Laura Avendaño
2016-06-07 12:20:43 -04:00
parent 4bec5f6386 96c7db3652
commit 85114b9d6e
1 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,16 +348,20 @@ 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();
$aConditions = [
[GroupwfPeer::GRP_UID, 'C.CON_ID'],
['C.CON_CATEGORY', $sDelimiter . 'GRP_TITLE' . $sDelimiter],
['C.CON_LANG', 'if((SELECT COUNT(S.CON_ID) FROM CONTENT AS S WHERE S.CON_ID=C.CON_ID AND S.CON_CATEGORY=C.CON_CATEGORY AND S.CON_LANG=' . $sDelimiter . SYS_LANG . $sDelimiter . ')>0,' . $sDelimiter . SYS_LANG . $sDelimiter . ',' . $sDelimiter . 'en' . $sDelimiter . ')']
];
$totalCount = 0; $totalCount = 0;
$criteria = new Criteria('workflow'); $criteria = new Criteria('workflow');
$criteria->addSelectColumn(GroupwfPeer::GRP_UID); $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); $criteria->addAlias('C', 'CONTENT');
$criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG );
if ($search) { if ($search) {
$criteria->add( ContentPeer::CON_VALUE, '%' . $search . '%', Criteria::LIKE ); $criteria->add('C.CON_VALUE', '%' . $search . '%', Criteria::LIKE);
} }
$totalRows = GroupwfPeer::doCount($criteria); $totalRows = GroupwfPeer::doCount($criteria);
@@ -366,13 +370,12 @@ class Groupwf extends BaseGroupwf
$criteria->addSelectColumn(GroupwfPeer::GRP_UID); $criteria->addSelectColumn(GroupwfPeer::GRP_UID);
$criteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$criteria->addSelectColumn(GroupwfPeer::GRP_UX); $criteria->addSelectColumn(GroupwfPeer::GRP_UX);
$criteria->addAsColumn( 'GRP_TITLE', ContentPeer::CON_VALUE ); $criteria->addAlias('C', 'CONTENT');
$criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); $criteria->addAsColumn('GRP_TITLE', 'C.CON_VALUE');
$criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$criteria->add( ContentPeer::CON_LANG, SYS_LANG );
if (is_null($sortField) || trim($sortField) == "") { if (is_null($sortField) || trim($sortField) == "") {
$sortField = ContentPeer::CON_VALUE; $sortField = 'GRP_TITLE';
} }
if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") { if (!is_null($sortDir) && trim($sortDir) != "" && strtoupper($sortDir) == "DESC") {
@@ -390,12 +393,12 @@ class Groupwf extends BaseGroupwf
} }
if ($search) { if ($search) {
$criteria->add( ContentPeer::CON_VALUE, '%' . $search . '%', Criteria::LIKE ); $criteria->add('C.CON_VALUE', '%' . $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();
$uids = array(); $uids = array();
$groups = array(); $groups = array();
$aGroups = array(); $aGroups = array();
@@ -403,8 +406,7 @@ class Groupwf extends BaseGroupwf
$groups[] = $oDataset->getRow(); $groups[] = $oDataset->getRow();
} }
return array ('rows' => $groups,'totalCount' => $totalRows return array('rows' => $groups, 'totalCount' => $totalRows);
);
} }
public function filterGroup ($filter, $start, $limit) public function filterGroup ($filter, $start, $limit)