fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in darojas/processmaker (pull request #609)

Browse Source 
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”. Se quita validacion para var_default en process_variables
This commit is contained in:
Erik Amaru Ortiz
2014-07-18 11:47:39 -04:00
parent d537e295b2 d752528b71
commit 1f4ded7897
2 changed files with 9 additions and 4 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']);
$oDataset->next();
}
// Users
$oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\ProcessUserPeer::USR_UID);
@@ -201,7 +202,7 @@ class ProcessSupervisor
$permission = $userRole->loadUserRolePermission('PROCESSMAKER', $value["USR_UID"]);
foreach ($permission as $values) {
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'],
'obj_type' => "group");
}
@@ -210,6 +211,13 @@ class ProcessSupervisor
$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();
$oCriteria = new \Criteria('workflow');
$oCriteria->addSelectColumn(\UsersPeer::USR_UID);

3
workflow/engine/src/ProcessMaker/BusinessModel/Variable.php
View File

@@ -372,9 +372,6 @@ class Variable
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES", array('$var_null','0, 1' )));
}
}
if (isset($aData["VAR_DEFAULT"])) {
Validator::isString($aData['VAR_DEFAULT'], '$var_default');
}
if (isset($aData["VAR_ACCEPTED_VALUES"])) {
Validator::isString($aData['VAR_ACCEPTED_VALUES'], '$var_accepted_values');
}