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

Merged in gproly/processmaker/HOR-135 (pull request #3690)

Browse Source 
HOR-135
This commit is contained in:
Julio Cesar Laura Avendaño
2016-02-05 13:40:00 -04:00
parent ba8266007d 392b581a74
commit ebcf94a351
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -22,6 +22,18 @@ class Light
{ {
$response = null; $response = null;
try { try {
// getting bpmn projects
$c = new Criteria('workflow');
$c->addSelectColumn(\BpmnProjectPeer::PRJ_UID);
$ds = \ProcessPeer::doSelectRS($c, \Propel::getDbConnection('workflow_ro'));
$ds->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$bpmnProjects = array();
while ($ds->next()) {
$row = $ds->getRow();
$bpmnProjects[] = $row['PRJ_UID'];
}
$oProcess = new \Process(); $oProcess = new \Process();
$oCase = new \Cases(); $oCase = new \Cases();
@@ -65,7 +77,7 @@ class Light
$tempTreeChildren = array (); $tempTreeChildren = array ();
foreach ($processList[$key] as $keyChild => $processInfoChild) { foreach ($processList[$key] as $keyChild => $processInfoChild) {
$webEntryEventStart = $webEntryEvent->getWebEntryEvents($processInfoChild['pro_uid']); $webEntryEventStart = $webEntryEvent->getWebEntryEvents($processInfoChild['pro_uid']);
if(empty($webEntryEventStart)){ if (empty($webEntryEventStart) && in_array($processInfoChild['pro_uid'], $bpmnProjects)) {
$tempTreeChild['text'] = $keyChild; //ellipsis ( $keyChild, 50 ); $tempTreeChild['text'] = $keyChild; //ellipsis ( $keyChild, 50 );
$tempTreeChild['processId'] = $processInfoChild['pro_uid']; $tempTreeChild['processId'] = $processInfoChild['pro_uid'];
$tempTreeChild['taskId'] = $processInfoChild['uid']; $tempTreeChild['taskId'] = $processInfoChild['uid'];