fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 7955 this issue was fixed.

Browse Source
This commit is contained in:
Alvaro Campos
2011-11-21 11:28:31 -04:00
parent 18ec153a55
commit 5d47fed94f
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,26 +117,15 @@ switch ($_POST['action'])
$oCriteria->add(ContentPeer::CON_VALUE, '%'.$filter.'%', Criteria::LIKE); $oCriteria->add(ContentPeer::CON_VALUE, '%'.$filter.'%', Criteria::LIKE);
} }
$totalRows = GroupwfPeer::doCount($oCriteria); $totalRows = GroupwfPeer::doCount($oCriteria);
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->clearSelectColumns();
$oCriteria->addSelectColumn(GroupwfPeer::GRP_UID); $oCriteria->addSelectColumn(GroupwfPeer::GRP_UID);
$oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $oCriteria->addSelectColumn(GroupwfPeer::GRP_STATUS);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE); $oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oCriteria->addAsColumn('GRP_TASKS', 0);
$oCriteria->addAsColumn('GRP_USERS', 0);
$oCriteria->addJoin(GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN);
$oCriteria->add(ContentPeer::CON_CATEGORY,'GRP_TITLE');
$oCriteria->add(ContentPeer::CON_LANG,SYS_LANG);
if ($filter != ''){
$oCriteria->add(ContentPeer::CON_VALUE, '%'.$filter.'%', Criteria::LIKE);
}
$oCriteria->setOffset($start);
$oCriteria->setLimit($limit);
$oDataset = GroupwfPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
global $RBAC;
$tasks = new TaskUser(); $tasks = new TaskUser();
$aTask = $tasks->getCountAllTaksByGroups(); $aTask = $tasks->getCountAllTaksByGroups();
@@ -145,12 +134,15 @@ switch ($_POST['action'])
$arrData = Array(); $arrData = Array();
while ($oDataset->next()){ while ($oDataset->next()){
$arrData[] = $oDataset->getRow(); $row = $oDataset->getRow();
$index = sizeof($arrData)-1; $row['GRP_TASKS'] = isset($aTask[$arrData[$index]['GRP_UID']]) ? $aTask[$arrData[$index]['GRP_UID']] : 0;
$arrData[$index]['GRP_TASKS'] = isset($aTask[$arrData[$index]['GRP_UID']]) ? $aTask[$arrData[$index]['GRP_UID']] : 0; $row['GRP_USERS'] = isset($aMembers[$arrData[$index]['GRP_UID']]) ? $aMembers[$arrData[$index]['GRP_UID']] : 0;
$arrData[$index]['GRP_USERS'] = isset($aMembers[$arrData[$index]['GRP_UID']]) ? $aMembers[$arrData[$index]['GRP_UID']] : 0; $group = GroupwfPeer::retrieveByPK($row['GRP_UID']);
$row['CON_VALUE']= $group->getGrpTitle();
$arrData[] = $row;
} }
echo '{success: true, groups: '.G::json_encode($arrData).', total_groups: '.$totalRows.'}';
echo '{success: true, groups: '.G::json_encode($arrData).', total_groups: '.$totalRows.'}'; die;
break; break;
case 'exitsGroupName': case 'exitsGroupName':
require_once 'classes/model/Groupwf.php'; require_once 'classes/model/Groupwf.php';