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

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-06-15 17:29:52 -04:00
parent 8d5ebb0d00 5b6dc0667e
commit 9ca3a7981c
25 changed files with 570 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -155,7 +155,8 @@ class Task
"TAS_SELFSERVICE_TIMEOUT" => $arrayDataAux["TAS_SELFSERVICE_TIMEOUT"],
"TAS_SELFSERVICE_TIME" => $arrayDataAux["TAS_SELFSERVICE_TIME"],
"TAS_SELFSERVICE_TIME_UNIT" => $arrayDataAux["TAS_SELFSERVICE_TIME_UNIT"],
"TAS_SELFSERVICE_TRIGGER_UID" => $arrayDataAux["TAS_SELFSERVICE_TRIGGER_UID"]
"TAS_SELFSERVICE_TRIGGER_UID" => $arrayDataAux["TAS_SELFSERVICE_TRIGGER_UID"],
"TAS_SELFSERVICE_EXECUTION" => $arrayDataAux["TAS_SELFSERVICE_EXECUTION"]
),
$keyCase
);
@@ -281,6 +282,7 @@ class Task
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION");
break;
case 'EVALUATE':
if (empty($arrayProperty["TAS_ASSIGN_VARIABLE"])) {
@@ -291,6 +293,7 @@ class Task
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION");
break;
case 'SELF_SERVICE':
case 'SELF_SERVICE_EVALUATE':
@@ -316,10 +319,14 @@ class Task
if (empty($arrayProperty["TAS_SELFSERVICE_TRIGGER_UID"])) {
throw (new \Exception("Invalid value specified for 'tas_selfservice_trigger_uid'"));
}
if (empty($arrayProperty["TAS_SELFSERVICE_EXECUTION"])) {
throw (new \Exception("Invalid value specified for 'tas_selfservice_execution'"));
}
} else {
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TIME_UNIT");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_TRIGGER_UID");
$this->unsetVar($arrayProperty, "TAS_SELFSERVICE_EXECUTION");
}
break;
}