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

Merge pull request #78 from brayanpereyra/BUG-9313

Browse Source 
BUG 9313 Can't activate a GROUP with status inactive SOLVED
This commit is contained in:
julceslauhub
2012-06-18 20:26:54 -07:00
parent 236edb72c3 5f0593210d
commit 4d6b3fae63
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,10 +324,7 @@ 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->add(GroupwfPeer::GRP_STATUS, 'ACTIVE');
$criteriaCount = clone $criteria;
if($start != '') if($start != '')
$criteria->setOffset($start); $criteria->setOffset($start);
@@ -373,19 +370,13 @@ class Groupwf extends BaseGroupwf {
continue; continue;
} }
$totalCount++;
$group['GRP_TITLE'] = $grpTitle; $group['GRP_TITLE'] = $grpTitle;
$aGroups[] = $group; $aGroups[] = $group;
} }
$criteriaCount->clearSelectColumns(); return array('rows' => $aGroups, 'totalCount'=>$totalCount);
$criteriaCount->addSelectColumn('COUNT(*) AS CNT');
$dt = ContentPeer::doSelectRS ($criteriaCount);
$dt->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dt->next();
$row = $dt->getRow();
return array('rows' => $aGroups, 'totalCount'=>$row ['CNT']);
} }
function filterGroup($filter,$start,$limit) function filterGroup($filter,$start,$limit)

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

@@ -123,6 +123,7 @@ switch ($_POST['action'])
$result = $data['rows']; $result = $data['rows'];
$totalRows = 0; $totalRows = 0;
$arrData = array();
foreach ($result as $results) { foreach ($result as $results) {
$totalRows ++; $totalRows ++;
$results['CON_VALUE'] = $results['GRP_TITLE']; $results['CON_VALUE'] = $results['GRP_TITLE'];