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

BUG 9200 "La variable @@APPLICATION vacia" SOLVED

Browse Source 
- PMFDerivateCase not set variables of the case to derivate
- In the "derivateCase" method of the class "class.wsBase.php", no set
  variables of the case to derivate
- Problem solved, now set appropriate variables to derivate
This commit is contained in:
Victor Saisa Lopez
2012-07-23 17:09:07 -04:00
parent d2e823f028
commit 731b017965
2 changed files with 274 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gulliver/system/class.g.php
View File

@@ -2855,10 +2855,11 @@ $output = $outputHeader.$output;
function CurDate($sFormat='')
{
$sFormat = ($sFormat != '')? $sFormat : 'Y-m-d H:i:s';
return date($sFormat);
}
/*
/**
* Return the System defined constants and Application variables
* Constants: SYS_*
* Sessions : USER_* , URS_*
@@ -2867,9 +2868,18 @@ $output = $outputHeader.$output;
{
$t1 = G::microtime_float();
$sysCon = array();
if (defined("SYS_LANG")) $sysCon["SYS_LANG"] = SYS_LANG;
if (defined("SYS_SKIN")) $sysCon["SYS_SKIN"] = SYS_SKIN;
if (defined("SYS_SYS")) $sysCon["SYS_SYS"] = SYS_SYS;
if (defined("SYS_LANG")) {
$sysCon["SYS_LANG"] = SYS_LANG;
}
if (defined("SYS_SKIN")) {
$sysCon["SYS_SKIN"] = SYS_SKIN;
}
if (defined("SYS_SYS")) {
$sysCon["SYS_SYS"] = SYS_SYS;
}
$sysCon["APPLICATION"] = (isset($_SESSION["APPLICATION"]))? $_SESSION["APPLICATION"] : "";
$sysCon["PROCESS"] = (isset($_SESSION["PROCESS"]))? $_SESSION["PROCESS"] : "";
@@ -2883,30 +2893,35 @@ $output = $outputHeader.$output;
//###############################################################################################
if ($params != null) {
if (isset($params->option)) {
switch ($params->option) {
case "STORED SESSION":
if (isset($params->SID)) {
G::LoadClass("sessions");
$oSessions = new Sessions($params->SID);
$sysCon = array_merge($sysCon, $oSessions->getGlobals());
}
break;
}
}
if (isset($params->appData) && is_array($params->appData)) {
$sysCon["APPLICATION"] = $params->appData["APPLICATION"];
$sysCon["PROCESS"] = $params->appData["PROCESS"];
$sysCon["TASK"] = $params->appData["TASK"];
$sysCon["INDEX"] = $params->appData["INDEX"];
if (empty($sysCon["USER_LOGGED"])) {
$sysCon["USER_LOGGED"] = $params->appData["USER_LOGGED"];
$sysCon["USR_USERNAME"] = $params->appData["USR_USERNAME"];
}
}
}
return $sysCon;
}
/*
* Return the Friendly Title for a string, capitalize every word and remove spaces
* param : text string
@@ -5212,3 +5227,4 @@ function __($msgID , $lang = SYS_LANG, $data = null)
{
return G::LoadTranslation($msgID, $lang, $data);
}

67
workflow/engine/classes/class.wsBase.php
View File

@@ -1791,22 +1791,18 @@ class wsBase
//$appFields = $oCase->loadCase( $caseId );
//$appFields['APP_DATA']['APPLICATION'] = $caseId;
//@Neyek #######################################################################################
if (!$this->stored_system_variables) {
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants());
} else {
$oParams = new stdClass();
$oParams->option = "STORED SESSION";
$oParams->SID = $this->wsSessionId;
$oParams->appData = $appFields["APP_DATA"];
//Set variables
$params = new stdClass();
$params->appData = $appFields["APP_DATA"];
$appFields["APP_DATA"] = array_merge(
$appFields["APP_DATA"],
G::getSystemConstants($oParams)
);
if ($this->stored_system_variables) {
$params->option = "STORED SESSION";
$params->SID = $this->wsSessionId;
}
//##############################################################################################
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants($params));
//PMScript
$oPMScript->setFields($appFields['APP_DATA']);
$bExecute = true;
@@ -1835,26 +1831,26 @@ class wsBase
$aTriggers = $oCase->loadTriggers($appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE');
if (count($aTriggers) > 0) {
$oPMScript = new PMScript();
$varTriggers .= "<b>-= Before Derivation =-</b><br/>";
$oPMScript = new PMScript();
foreach ($aTriggers as $aTrigger) {
//$appFields = $oCase->loadCase( $caseId );
//$appFields['APP_DATA']['APPLICATION'] = $caseId;
//@Neyek ###########################################################################################
if (!$this->stored_system_variables) {
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants());
} else {
$oParams = new stdClass();
$oParams->option = "STORED SESSION";
$oParams->SID = $this->wsSessionId;
$oParams->appData = $appFields["APP_DATA"];
//Set variables
$params = new stdClass();
$params->appData = $appFields["APP_DATA"];
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants($oParams));
if ($this->stored_system_variables) {
$params->option = "STORED SESSION";
$params->SID = $this->wsSessionId;
}
//##################################################################################################
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants($params));
//PMScript
$oPMScript->setFields($appFields['APP_DATA']);
$bExecute = true;
@@ -1960,26 +1956,27 @@ class wsBase
$oDerivation->derivate($aCurrentDerivation, $nextDelegations);
$appFields = $oCase->loadCase($caseId);
//Execute triggers after derivation
$aTriggers = $oCase->loadTriggers($appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER');
if (count($aTriggers) > 0) {
$oPMScript = new PMScript();
//$appFields['APP_DATA']['APPLICATION'] = $caseId;
//@Neyek #############################################################################################
if (!$this->stored_system_variables) {
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants());
} else {
$oParams = new stdClass();
$oParams->option = "STORED SESSION";
$oParams->SID = $this->wsSessionId;
$oParams->appData = $appFields["APP_DATA"];
//Set variables
$params = new stdClass();
$params->appData = $appFields["APP_DATA"];
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants($oParams));
if ($this->stored_system_variables) {
$params->option = "STORED SESSION";
$params->SID = $this->wsSessionId;
}
//####################################################################################################
$appFields["APP_DATA"] = array_merge($appFields["APP_DATA"], G::getSystemConstants($params));
//PMScript
$oPMScript = new PMScript();
$oPMScript->setFields($appFields['APP_DATA']);
$varTriggers .= "<b>-= After Derivation =-</b><br/>";
foreach ($aTriggers as $aTrigger) {