From eb558e9d2ab6c491cee03d08113d15096a84c8ff Mon Sep 17 00:00:00 2001
From: Victor Saisa Lopez <victor@colosa.com>
Date: Wed, 27 May 2015 14:53:05 -0400
Subject: [PATCH] PM-00000 "Revert & Fix: Fix to import process" SOLVED

Issue:
    Fix to import process
Cause:
    No import correctly attribute "taskExtraProperties"
Solution:
    Fix to export and import the attribute "taskExtraProperties" of a project
---
 workflow/engine/classes/class.processes.php   | 11 +++++-----
 .../engine/classes/model/Configuration.php    | 20 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index c4b753501..792e124e8 100755
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -968,7 +968,7 @@ class Processes
                 }
             }
         }
-        
+
         if (isset($oData->taskExtraProperties)) {
             foreach ($oData->taskExtraProperties as $key => $value) {
                 $record = $value;
@@ -3757,7 +3757,7 @@ class Processes
 
         // for public files
         $PUBLIC_ROOT_PATH = PATH_DATA . 'sites' . PATH_SEP . SYS_SYS . PATH_SEP . 'public' . PATH_SEP . $data->process['PRO_UID'];
-        
+
         //Get WebEntry file names
         $arrayWebEntryFile = array();
 
@@ -4250,7 +4250,7 @@ class Processes
                     if ($fsContent > 0) {
                         $fileContent = fread( $fp, $fsContent ); //reading string $XmlContent
                         $newFileName = $pathPublic . $sFileName;
-                        
+
                         if (in_array($sFileName, $arrayWebEntryFile)) {
                             continue;
                         }
@@ -4280,8 +4280,9 @@ class Processes
     public function createTaskExtraPropertiesRows ($aTaskExtraProperties)
     {
         if (count($aTaskExtraProperties) > 0) {
-            $oConfig = new Configuration();
             foreach ($aTaskExtraProperties as $key => $row) {
+                $oConfig = new Configuration();
+
                 if ($oConfig->exists( $row['CFG_UID'], $row['OBJ_UID'], $row['PRO_UID'], $row['USR_UID'], $row['APP_UID']) ) {
                     $oConfig->remove( $row['CFG_UID'], $row['OBJ_UID'], $row['PRO_UID'], $row['USR_UID'], $row['APP_UID'] );
                     $oConfig->setDeleted(false);
@@ -5167,7 +5168,7 @@ class Processes
             throw $e;
         }
     }
-    
+
     public function truncateName($proTitle)
     {
         $proTitle = str_replace(".","_",$proTitle);
diff --git a/workflow/engine/classes/model/Configuration.php b/workflow/engine/classes/model/Configuration.php
index 51c8fb86c..ee81c1dc7 100755
--- a/workflow/engine/classes/model/Configuration.php
+++ b/workflow/engine/classes/model/Configuration.php
@@ -6,19 +6,17 @@ class Configuration extends BaseConfiguration
         $cnn = Propel::getConnection(ConfigurationPeer::DATABASE_NAME);
 
         try {
-            $configuration = new Configuration();
+            $this->setCfgUid($arrayData["CFG_UID"]);
+            $this->setObjUid($arrayData["OBJ_UID"]);
+            $this->setCfgValue((isset($arrayData["CFG_VALUE"]))? $arrayData["CFG_VALUE"] : "");
+            $this->setProUid($arrayData["PRO_UID"]);
+            $this->setUsrUid($arrayData["USR_UID"]);
+            $this->setAppUid($arrayData["APP_UID"]);
 
-            $configuration->setCfgUid($arrayData["CFG_UID"]);
-            $configuration->setObjUid($arrayData["OBJ_UID"]);
-            $configuration->setCfgValue((isset($arrayData["CFG_VALUE"]))? $arrayData["CFG_VALUE"] : "");
-            $configuration->setProUid($arrayData["PRO_UID"]);
-            $configuration->setUsrUid($arrayData["USR_UID"]);
-            $configuration->setAppUid($arrayData["APP_UID"]);
-
-            if ($configuration->validate()) {
+            if ($this->validate()) {
                 $cnn->begin();
 
-                $result = $configuration->save();
+                $result = $this->save();
 
                 $cnn->commit();
 
@@ -27,7 +25,7 @@ class Configuration extends BaseConfiguration
             } else {
                 $msg = "";
 
-                foreach ($configuration->getValidationFailures() as $validationFailure) {
+                foreach ($this->getValidationFailures() as $validationFailure) {
                     $msg = $msg . (($msg != "")? "\n" : "") . $validationFailure->getMessage();
                 }