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

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
marcelo.cuiza
2015-07-21 10:15:12 -04:00
parent 3dced800b3 27b60dadbc
commit ef287cb3da
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/class.pmDynaform.php
View File

@@ -68,8 +68,15 @@ class pmDynaform
public function getCredentials()
{
$flagTrackerUser = false;
if (!isset($_SESSION['USER_LOGGED'])) {
return;
if (!preg_match("/^.*\/" . SYS_SKIN . "\/tracker\/.*$/", $_SERVER["REQUEST_URI"])) {
return;
}
$_SESSION["USER_LOGGED"] = "00000000000000000000000000000001";
$flagTrackerUser = true;
}
if ($this->credentials != null) {
return $this->credentials;
@@ -84,6 +91,11 @@ class pmDynaform
"clientId" => $a["client_id"],
"clientSecret" => $a["client_secret"]
);
if ($flagTrackerUser) {
unset($_SESSION["USER_LOGGED"]);
}
return $this->credentials;
}
@@ -163,7 +175,7 @@ class pmDynaform
array_push($json->options, $option);
}
} catch (Exception $e) {
}
}
if (isset($json->options[0])) {

2
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -358,6 +358,7 @@ class Light
case 'REPORT_TO':
case 'BALANCED':
case 'SELF_SERVICE':
$taskAss = array();
$taskAss['taskId'] = $aValues['NEXT_TASK']['TAS_UID'];
$taskAss['taskName'] = $aValues['NEXT_TASK']['TAS_TITLE'];
$taskAss['taskAssignType'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];
@@ -371,6 +372,7 @@ class Light
$response[] = $taskAss;
break;
case 'MANUAL':
$manual = array();
$manual['taskId'] = $aValues['NEXT_TASK']['TAS_UID'];
$manual['taskName'] = $aValues['NEXT_TASK']['TAS_TITLE'];
$manual['taskAssignType'] = $aValues['NEXT_TASK']['TAS_ASSIGN_TYPE'];