diff --git a/workflow/engine/classes/model/Groupwf.php b/workflow/engine/classes/model/Groupwf.php index 9b0210cf0..5802006d0 100755 --- a/workflow/engine/classes/model/Groupwf.php +++ b/workflow/engine/classes/model/Groupwf.php @@ -324,10 +324,7 @@ class Groupwf extends BaseGroupwf { $criteria->addSelectColumn(GroupwfPeer::GRP_UID); $criteria->addSelectColumn(GroupwfPeer::GRP_STATUS); $criteria->addSelectColumn(GroupwfPeer::GRP_UX); - $criteria->add(GroupwfPeer::GRP_STATUS, 'ACTIVE'); - - $criteriaCount = clone $criteria; - + if($start != '') $criteria->setOffset($start); @@ -373,19 +370,13 @@ class Groupwf extends BaseGroupwf { continue; } + $totalCount++; + $group['GRP_TITLE'] = $grpTitle; - $aGroups[] = $group; } - $criteriaCount->clearSelectColumns(); - $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']); + return array('rows' => $aGroups, 'totalCount'=>$totalCount); } function filterGroup($filter,$start,$limit) diff --git a/workflow/engine/methods/groups/groups_Ajax.php b/workflow/engine/methods/groups/groups_Ajax.php index 99aedde1e..61257e645 100755 --- a/workflow/engine/methods/groups/groups_Ajax.php +++ b/workflow/engine/methods/groups/groups_Ajax.php @@ -123,6 +123,7 @@ switch ($_POST['action']) $result = $data['rows']; $totalRows = 0; + $arrData = array(); foreach ($result as $results) { $totalRows ++; $results['CON_VALUE'] = $results['GRP_TITLE'];