From 9de72c41321b29022d3b59fb3269705d6f82cd4e Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 20 Mar 2014 15:07:09 -0400 Subject: [PATCH 1/2] Adicion de validacion en ACTIVITY --- workflow/engine/src/BusinessModel/Task.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php index 47c86237f..74bdf1178 100644 --- a/workflow/engine/src/BusinessModel/Task.php +++ b/workflow/engine/src/BusinessModel/Task.php @@ -297,6 +297,9 @@ class Task break; case 'SELF_SERVICE': case 'SELF_SERVICE_EVALUATE': + if (trim($arrayProperty["TAS_GROUP_VARIABLE"]) == "") { + $arrayProperty["TAS_GROUP_VARIABLE"] = "@@SYS_GROUP_TO_BE_ASSIGNED"; + } if ($arrayProperty["TAS_ASSIGN_TYPE"] == "SELF_SERVICE_EVALUATE") { if (empty($arrayProperty["TAS_GROUP_VARIABLE"])) { throw (new \Exception("Invalid value specified for 'tas_group_variable'")); @@ -313,12 +316,12 @@ class Task if (empty($arrayProperty["TAS_SELFSERVICE_TIME"])) { throw (new \Exception("Invalid value specified for 'tas_assign_variable'")); } + if (empty($arrayProperty["TAS_SELFSERVICE_TIME_UNIT"])) { + throw (new \Exception("Invalid value specified for 'tas_assign_variable'")); + } if (empty($arrayProperty["TAS_SELFSERVICE_TRIGGER_UID"])) { throw (new \Exception("Invalid value specified for 'tas_selfservice_trigger_uid'")); } - if (trim($arrayProperty["TAS_GROUP_VARIABLE"]) == "") { - $arrayProperty["TAS_GROUP_VARIABLE"] = "@@SYS_GROUP_TO_BE_ASSIGNED"; - } } else { $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME"); $this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT"); From 356086dda377479765aeae2c87f5228b60327046 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 20 Mar 2014 15:14:56 -0400 Subject: [PATCH 2/2] Adicion de validacion en ACTIVITY --- workflow/engine/src/BusinessModel/Task.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/BusinessModel/Task.php b/workflow/engine/src/BusinessModel/Task.php index 74bdf1178..93ffb2cde 100644 --- a/workflow/engine/src/BusinessModel/Task.php +++ b/workflow/engine/src/BusinessModel/Task.php @@ -317,7 +317,7 @@ class Task throw (new \Exception("Invalid value specified for 'tas_assign_variable'")); } if (empty($arrayProperty["TAS_SELFSERVICE_TIME_UNIT"])) { - throw (new \Exception("Invalid value specified for 'tas_assign_variable'")); + throw (new \Exception("Invalid value specified for 'tas_selfservice_time_unit'")); } if (empty($arrayProperty["TAS_SELFSERVICE_TRIGGER_UID"])) { throw (new \Exception("Invalid value specified for 'tas_selfservice_trigger_uid'"));