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

BUG-15041 "Inactive Groups are display in list of available..." SOLVED

Browse Source 
- Inactive Groups are display in list of available groups
- Added condition to only get active groups
This commit is contained in:
Victor Saisa Lopez
2014-06-09 10:04:55 -04:00
parent 9b091e24b8
commit d205e8b4eb
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.processMap.php
View File

@@ -1239,7 +1239,7 @@ class processMap
$result = $groups->getAllGroup($start, $limit, $filter); $result = $groups->getAllGroup($start, $limit, $filter);
$c = 0; $c = 0;
foreach ($result['rows'] as $results) { foreach ($result['rows'] as $results) {
if (!in_array($results['GRP_UID'], $aUIDS1)) { if ($results["GRP_STATUS"] == "ACTIVE" && !in_array($results["GRP_UID"], $aUIDS1)) {
$c++; $c++;
$oCriteria = new Criteria('workflow'); $oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER'); $oCriteria->addSelectColumn('COUNT(*) AS MEMBERS_NUMBER');

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

@@ -347,7 +347,6 @@ class Groupwf extends BaseGroupwf
$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->addAsColumn( 'GRP_TITLE', ContentPeer::CON_VALUE );
$criteria->addSelectColumn( ContentPeer::CON_VALUE, 'COCHALO' );
$criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN ); $criteria->addJoin( GroupwfPeer::GRP_UID, ContentPeer::CON_ID, Criteria::LEFT_JOIN );
$criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->add( ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( ContentPeer::CON_LANG, SYS_LANG ); $criteria->add( ContentPeer::CON_LANG, SYS_LANG );

1
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -900,6 +900,7 @@ class Task
$criteria->addSelectColumn( \GroupwfPeer::GRP_UX ); $criteria->addSelectColumn( \GroupwfPeer::GRP_UX );
$criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE ); $criteria->addAsColumn( 'GRP_TITLE', \ContentPeer::CON_VALUE );
$criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN ); $criteria->addJoin( \GroupwfPeer::GRP_UID, \ContentPeer::CON_ID, \Criteria::LEFT_JOIN );
$criteria->add(\GroupwfPeer::GRP_STATUS, "ACTIVE", \Criteria::EQUAL);
$criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' ); $criteria->add( \ContentPeer::CON_CATEGORY, 'GRP_TITLE' );
$criteria->add( \ContentPeer::CON_LANG, SYS_LANG ); $criteria->add( \ContentPeer::CON_LANG, SYS_LANG );
$criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE ); $criteria->addAscendingOrderByColumn( \ContentPeer::CON_VALUE );