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

Fix Bug 15443: Se lista varias veces el mismo grupo y la opción "USERS" muestra grupos en la ventana “ASSIGN USERS AND GROUPS AS SUPERVISORS”.

Browse Source
This commit is contained in:
Daniel Rojas
2014-07-17 10:18:00 -04:00
parent ddbc3f8493
commit 74bdbad6ee
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php
View File

@@ -40,6 +40,7 @@ class ProcessSupervisor
'grp_name' => $aRow['GRP_TITLE']); 'grp_name' => $aRow['GRP_TITLE']);
$oDataset->next(); $oDataset->next();
} }
// Users // Users
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\ProcessUserPeer::USR_UID); $oCriteria->addSelectColumn(\ProcessUserPeer::USR_UID);
@@ -201,7 +202,7 @@ class ProcessSupervisor
$permission = $userRole->loadUserRolePermission('PROCESSMAKER', $value["USR_UID"]); $permission = $userRole->loadUserRolePermission('PROCESSMAKER', $value["USR_UID"]);
foreach ($permission as $values) { foreach ($permission as $values) {
if ($values["PER_CODE"] == 'PM_SUPERVISOR') { if ($values["PER_CODE"] == 'PM_SUPERVISOR') {
$aRespLi[] = array('grp_uid' => $aRow['GRP_UID'], $aRespLiGroups[] = array('grp_uid' => $aRow['GRP_UID'],
'grp_name' => $aRow['GRP_TITLE'], 'grp_name' => $aRow['GRP_TITLE'],
'obj_type' => "group"); 'obj_type' => "group");
} }
@@ -210,6 +211,13 @@ class ProcessSupervisor
$oDataset->next(); $oDataset->next();
} }
} }
$exclude = array("");
for ($i = 0; $i<=count($aRespLiGroups)-1; $i++) {
if (!in_array(trim($aRespLiGroups[$i]["grp_uid"]) ,$exclude)) {
$aRespLi[] = $aRespLiGroups[$i];
$exclude[] = trim($aRespLiGroups[$i]["grp_uid"]);
}
}
$sDelimiter = \DBAdapter::getStringDelimiter(); $sDelimiter = \DBAdapter::getStringDelimiter();
$oCriteria = new \Criteria('workflow'); $oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\UsersPeer::USR_UID); $oCriteria->addSelectColumn(\UsersPeer::USR_UID);