From 3d636024e587655592667881f2d8e44ddd551847 Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Tue, 18 Oct 2016 16:41:33 -0400
Subject: [PATCH 1/3] HOR-2050

---
 workflow/engine/classes/class.processMap.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php
index 676684fe2..17b48250e 100644
--- a/workflow/engine/classes/class.processMap.php
+++ b/workflow/engine/classes/class.processMap.php
@@ -131,11 +131,9 @@ class processMap
                     $oDatasetX->next();
                     $aRowx = $oDatasetX->getRow();
                     if ($oProcess->exists($aRowx['PRO_UID'])) {
-                        //$aRowy = $oProcess->load($aRowx['PRO_UID']);
-                        //$oTask->label = $aRowy['PRO_TITLE'];
                         $oTask->label = htmlentities($aRowx['TAS_TITLE'], ENT_QUOTES, 'UTF-8');
                     } else {
-                        $oTask->label = htmlentities($aRow1['CON_VALUE'], ENT_QUOTES, 'UTF-8');
+                        $oTask->label = htmlentities($aRow1['TAS_TITLE'], ENT_QUOTES, 'UTF-8');
                     }
                 }
                 $oTask->taskINI = (strtolower($aRow1['TAS_START']) == 'true' ? true : false);

From 48477484aa4ceb2a8d50a317b9a080f97db2bc77 Mon Sep 17 00:00:00 2001
From: dheeyi william <dheeyi@gmail.com>
Date: Fri, 14 Oct 2016 09:12:23 -0400
Subject: [PATCH 2/3] =?UTF-8?q?HOR-1954=20Solicitud=20de=20cambio=20de=20c?=
 =?UTF-8?q?omportamiento=20en=20la=20restauraci=C3=B3n=20de=20workspaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow/engine/classes/class.wsTools.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index 2acdcb0f1..a141dad91 100644
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -1981,26 +1981,22 @@ class workspaceTools
         }
     }
 
-    public function verifyLicenseEnterprise ($workspace)
+    /**
+     * @param $workspace
+     */
+    public function verifyLicenseEnterprise($workspace)
     {
-        $this->initPropel( true );
-
-        require_once ("classes/model/LicenseManager.php");
+        $this->initPropel(true);
         $oCriteria = new Criteria('workflow');
         $oCriteria->add(LicenseManagerPeer::LICENSE_STATUS, 'ACTIVE');
         $oDataset = LicenseManagerPeer::doSelectRS($oCriteria);
         $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-        $row = array();
         if ($oDataset->next()) {
             $row = $oDataset->getRow();
-
-            $tr = LicenseManagerPeer::retrieveByPK ( $row['LICENSE_UID'] );
-            $pos = strpos( $row['LICENSE_PATH'], 'license_' );
-            $license = substr( $row['LICENSE_PATH'], $pos, strlen($row['LICENSE_PATH']));
-            $tr->setLicensePath   ( PATH_DATA . "sites/" . $workspace . "/licenses/" . $license);
-            $tr->setLicenseWorkspace ( $workspace );
-
-            $res = $tr->save ();
+            $tr = LicenseManagerPeer::retrieveByPK($row['LICENSE_UID']);
+            $tr->setLicensePath(PATH_DATA_SITE . basename($row['LICENSE_PATH']));
+            $tr->setLicenseWorkspace($workspace);
+            $res = $tr->save();
         }
     }
 

From 8ffaff07dbdff8f53b5ee9a70c27770532a30486 Mon Sep 17 00:00:00 2001
From: william barra <dheeyi@gmail.com>
Date: Tue, 18 Oct 2016 15:32:00 -0400
Subject: [PATCH 3/3] HOR-2055 IMPORT/PROCESS: No es posible hacer un OVERRITE
 de un proceso

---
 .../engine/src/ProcessMaker/Importer/Importer.php    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/Importer/Importer.php b/workflow/engine/src/ProcessMaker/Importer/Importer.php
index 65b79061c..09bd2d1e7 100644
--- a/workflow/engine/src/ProcessMaker/Importer/Importer.php
+++ b/workflow/engine/src/ProcessMaker/Importer/Importer.php
@@ -167,6 +167,14 @@ abstract class Importer
                 $generateUid = false;
                 break;
             case self::IMPORT_OPTION_OVERWRITE:
+                $obj = \ProcessPeer::retrieveByPK($this->metadata['uid']);
+                if (is_object($obj)) {
+                    if ($obj->getProTitle() !== $name) {
+                        if (\Process::existsByProTitle($name)) {
+                            $name = $name . ' ' . date('Y-m-d H:i:s');
+                        }
+                    }
+                }
                 //Shouldn't generate new UID for all objects
                 /*----------------------------------********---------------------------------*/
                 if($objectsToImport === ''){
@@ -212,13 +220,13 @@ abstract class Importer
                 //Should generate new UID for all objects
                 $this->disableProject();
 
-                $name = "New - " . $name . " - " . date("M d, H:i");
+                $name = "New - " . $name . " - " . date('Y-m-d H:i:s');
 
                 $generateUid = true;
                 break;
             case self::IMPORT_OPTION_KEEP_WITHOUT_CHANGING_AND_CREATE_NEW:
                 //Should generate new UID for all objects
-                $name = \G::LoadTranslation("ID_COPY_OF") . " - " . $name . " - " . date("M d, H:i");
+                $name = \G::LoadTranslation("ID_COPY_OF") . " - " . $name . " - " . date('Y-m-d H:i:s');
 
                 $generateUid = true;
                 break;