Merge pull request #572 from julceslauhub/master

Set session variable with the UID of the process when load the process map

workflow/engine/classes/class.processMap.php

@@ -371,8 +371,6 @@ class processMap {
 	      $oPM->taskOptions[]=$taskOption;
       }
 
-      $_SESSION['PROCESS'] = $sProcessUID;
-
       $oJSON = new Services_JSON();
       return $oJSON->encode($oPM);
     } catch (Exception $oError) {

workflow/engine/methods/processes/processes_Ajax.php

@@ -49,6 +49,7 @@ try {
   switch($_REQUEST['action'])
   {
   	case 'load':
+  	  $_SESSION['PROCESS'] = $oData->uid;
   	  if ($oData->ct) {
   	    $sOutput = $oProcessMap->load($oData->uid, true, $_SESSION['APPLICATION'], -1, $_SESSION['TASK'], $oData->ct);
   	  }
@@ -58,7 +59,7 @@ try {
   	    }
   	    else {
           if ($_SESSION['TASK'] != -1) {
-            $taskUid = $_SESSION['TASK'];            
+            $taskUid = $_SESSION['TASK'];
           } else {
             $c = new Criteria('workflow');
             $c->clearSelectColumns();
@@ -100,7 +101,7 @@ try {
   	  unlink(PATH_DATA ."sites" . PATH_SEP . SYS_SYS . PATH_SEP . "public" . PATH_SEP. $form['PRO_UID']. PATH_SEP .str_replace(".php","Post",$form['FILENAME']).".php");
   	  $oProcessMap->webEntry($_REQUEST['PRO_UID']);
   	break;
-  	
+
   	case 'webEntry_new':
   	  $oProcessMap->webEntry_new($oData->PRO_UID);
   	break;
@@ -119,11 +120,11 @@ try {
   	case 'webEntry':
   	  $oProcessMap->webEntry($oData->pro_uid);
   	break;
-  	
+
   	case 'webEntry_Val_Assig':
   	  include(PATH_METHODS . 'processes/webEntry_Val_Assig.php');
   	break;
-  	
+
   	case 'saveTitlePosition':
   	  $sOutput = $oProcessMap->saveTitlePosition($oData->pro_uid, $oData->position->x, $oData->position->y);
   	break;
@@ -453,7 +454,7 @@ try {
       }
 	  	$fcontent = file_get_contents($sDirectory);
 			$extion=explode(".",$_REQUEST['filename']);
-      
+
 	  	//if($extion[count($extion)-1]=='html' || $extion[count($extion)-1]=='txt'){
 	  	$aData = Array(
 	  		'pro_uid'=>$_REQUEST['pro_uid'],
@@ -466,7 +467,7 @@ try {
 	  		$aMessage['MESSAGE'] = G::loadTranslation(	'HTML_FILES' );
         $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/showMessage', '',$aMessage );
 	  		}*/
-	  		
+
     break;
     case 'saveFile':
     	global $G_PUBLISH;
@@ -474,7 +475,7 @@ try {
       $sDir = "";
       if(isset($_REQUEST['MAIN_DIRECTORY']))
         $sDir = $_REQUEST['MAIN_DIRECTORY'];
-        
+
       switch($sDir){
         case 'mailTemplates' : $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
         break;
@@ -483,11 +484,11 @@ try {
         default : $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
         break;
       }
-      
+
       $fp = fopen($sDirectory, 'w');
       $content = stripslashes($_REQUEST['fcontent']);
       $content = str_replace("@amp@", "&", $content);
-      $content = base64_decode($content);      
+      $content = base64_decode($content);
       fwrite($fp, $content);
       fclose($fp);
       echo 'saved: '. $sDirectory;
@@ -515,20 +516,20 @@ try {
 	  	$G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_FileEditCreateEmpty', '');
 	    G::RenderPage('publish', 'raw');
     break;
-  
+
     case "taskCases":
       require_once ("classes/model/Application.php");
       require_once ("classes/model/AppDelegation.php");
       require_once ("classes/model/AppDelay.php");
-      
+
       $criteria = new Criteria("workflow");
       $criteria->addSelectColumn("COUNT(DISTINCT APPLICATION.APP_UID)");
-      
+
       $criteria->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN);
       $criteria->addJoin(ApplicationPeer::APP_UID, AppDelayPeer::APP_UID, Criteria::LEFT_JOIN);
-      
+
       $criteria->add(AppDelegationPeer::TAS_UID, $oData->task_uid);
-      
+
       $criteria->add(
         $criteria->getNewCriterion(AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL)->addOr(
           $criteria->getNewCriterion(AppDelayPeer::APP_DELAY_UID, null, Criteria::ISNOTNULL)->addAnd(
@@ -538,14 +539,14 @@ try {
           )
         )
       );
-      
+
       $rs = ApplicationPeer::doSelectRS($criteria);
-      
+
       $rs->next();
       $row = $rs->getRow();
-        
+
       $response->casesNumRec = intval($row[0]);
-      
+
       $json = new Services_JSON();
       $sOutput = $json->encode($response);
       break;