From 7f5f7baad7324ec1764ddd60da84077929f8a256 Mon Sep 17 00:00:00 2001
From: Luis Fernando Saisa Lopez <luis.saisa@colosa.com>
Date: Tue, 3 Mar 2015 10:23:54 -0400
Subject: [PATCH 1/2] PM-000 "Email Server cambiar estructura de campos" SOLVED

> Solution:
  Se cambia el esquema de los campos MESS_FROM_MAIL y MESS_FROM_NAME que permita introducir valores nulos.
---
 workflow/engine/classes/model/map/EmailServerMapBuilder.php | 4 ++--
 workflow/engine/config/schema.xml                           | 6 +++---
 workflow/engine/data/mysql/schema.sql                       | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/workflow/engine/classes/model/map/EmailServerMapBuilder.php b/workflow/engine/classes/model/map/EmailServerMapBuilder.php
index ba474c9dd..d3ceb8f91 100644
--- a/workflow/engine/classes/model/map/EmailServerMapBuilder.php
+++ b/workflow/engine/classes/model/map/EmailServerMapBuilder.php
@@ -79,9 +79,9 @@ class EmailServerMapBuilder
 
         $tMap->addColumn('MESS_PASSWORD', 'MessPassword', 'string', CreoleTypes::VARCHAR, true, 256);
 
-        $tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, true, 256);
+        $tMap->addColumn('MESS_FROM_MAIL', 'MessFromMail', 'string', CreoleTypes::VARCHAR, false, 256);
 
-        $tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, true, 256);
+        $tMap->addColumn('MESS_FROM_NAME', 'MessFromName', 'string', CreoleTypes::VARCHAR, false, 256);
 
         $tMap->addColumn('SMTPSECURE', 'Smtpsecure', 'string', CreoleTypes::VARCHAR, true, 3);
 
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 012edebf3..a72dcc672 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -4030,7 +4030,7 @@
         <column name="DEL_DUE_DATE" type="TIMESTAMP" required="false"/>
         <column name="DEL_PRIORITY" type="VARCHAR" size="32" required="true" default="3"/>
         <column name="DEL_THREAD_STATUS" type="VARCHAR" size="32" required="true" default="OPEN"/>
-    </table> 
+    </table>
     <table name="LIST_COMPLETED">
         <vendor type="mysql">
             <parameter name="Name" value="LIST_COMPLETED"/>
@@ -4336,8 +4336,8 @@
         <column name="MESS_RAUTH" type="INTEGER" required="true" default="0" />
         <column name="MESS_ACCOUNT" type="VARCHAR" size="256" required="true" default="" />
         <column name="MESS_PASSWORD" type="VARCHAR" size="256" required="true" default="" />
-        <column name="MESS_FROM_MAIL" type="VARCHAR" size="256" required="true" default="" />
-        <column name="MESS_FROM_NAME" type="VARCHAR" size="256" required="true" default="" />
+        <column name="MESS_FROM_MAIL" type="VARCHAR" size="256" default="" />
+        <column name="MESS_FROM_NAME" type="VARCHAR" size="256" default="" />
         <column name="SMTPSECURE" type="VARCHAR" size="3" required="true" default="No" />
         <column name="MESS_TRY_SEND_INMEDIATLY" type="INTEGER" required="true" default="0" />
         <column name="MAIL_TO" type="VARCHAR" size="256" required="true" default="" />
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 9066d054f..79c15e9d7 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -2483,7 +2483,6 @@ CREATE TABLE `MESSAGE_TYPE_VARIABLE`
 
 DROP TABLE IF EXISTS `EMAIL_SERVER`;
 
-
 CREATE TABLE `EMAIL_SERVER`
 (
 	`MESS_UID` VARCHAR(32) default '' NOT NULL,
@@ -2493,8 +2492,8 @@ CREATE TABLE `EMAIL_SERVER`
 	`MESS_RAUTH` INTEGER default 0 NOT NULL,
 	`MESS_ACCOUNT` VARCHAR(256) default '' NOT NULL,
 	`MESS_PASSWORD` VARCHAR(256) default '' NOT NULL,
-	`MESS_FROM_MAIL` VARCHAR(256) default '' NOT NULL,
-	`MESS_FROM_NAME` VARCHAR(256) default '' NOT NULL,
+	`MESS_FROM_MAIL` VARCHAR(256) default '',
+	`MESS_FROM_NAME` VARCHAR(256) default '',
 	`SMTPSECURE` VARCHAR(3) default 'No' NOT NULL,
 	`MESS_TRY_SEND_INMEDIATLY` INTEGER default 0 NOT NULL,
 	`MAIL_TO` VARCHAR(256) default '' NOT NULL,

From 95740b0b15dedaf1c24231991fac61f6df67418b Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Tue, 3 Mar 2015 14:05:39 -0400
Subject: [PATCH 2/2] PM-1703 La funcionalidad "Type Process" en procesos no
 funciona SOLVED

---
 workflow/engine/methods/processes/processesList.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/methods/processes/processesList.php b/workflow/engine/methods/processes/processesList.php
index f677292ed..354209ce9 100755
--- a/workflow/engine/methods/processes/processesList.php
+++ b/workflow/engine/methods/processes/processesList.php
@@ -40,16 +40,16 @@ $memcacheUsed = 'not used';
 $totalCount = 0;
 if (isset( $_POST['category'] ) && $_POST['category'] !== '<reset>') {
     if (isset( $_POST['processName'] ))
-        $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName']);
+        $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
     else
-        $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category']);
+        $proData = $oProcess->getAllProcesses( $start, $limit, $_POST['category'], null, true, false, $_SESSION["USER_LOGGED"]);
 } else {
     if (isset( $_POST['processName'] )) {
         $memkey = 'processList-' . $start . '-' . $limit . '-' . $_POST['processName'];
         $memcacheUsed = 'yes';
         $proData = $memcache->get( $memkey );
         if ($proData === false) {
-            $proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName']);
+            $proData = $oProcess->getAllProcesses( $start, $limit, null, $_POST['processName'], true, false, $_SESSION["USER_LOGGED"]);
             $memcache->set( $memkey, $proData, PMmemcached::ONE_HOUR );
             $totalCount = count($proData);
             $proData = array_splice($proData, $start, $limit);