From 74bdbad6ee2468b1a8149f632b3c7c53ae0a0b4c Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Thu, 17 Jul 2014 10:18:00 -0400 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20Bug=2015443:=20Se=20lista=20varias=20?= =?UTF-8?q?veces=20el=20mismo=20grupo=20y=20la=20opci=C3=B3n=20"USERS"=20m?= =?UTF-8?q?uestra=20grupos=20en=20la=20ventana=20=E2=80=9CASSIGN=20USERS?= =?UTF-8?q?=20AND=20GROUPS=20AS=20SUPERVISORS=E2=80=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessMaker/BusinessModel/ProcessSupervisor.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php index 052b1357d..8ed7dd426 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ProcessSupervisor.php @@ -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); From d752528b7103a53dbed59b6ec7487734d95d9ea2 Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Thu, 17 Jul 2014 10:23:24 -0400 Subject: [PATCH 2/2] Se quita validacion para var_default en process_variables --- workflow/engine/src/ProcessMaker/BusinessModel/Variable.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php index 45db27736..9338fd43f 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Variable.php @@ -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'); }