From c1d03bc932d4fddfc0ca0fa75fe7da9278fadae5 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Mon, 17 Apr 2017 11:17:08 -0400
Subject: [PATCH] PR observations

---
 workflow/engine/classes/class.wsBase.php   | 11 ++++++-----
 workflow/engine/classes/model/AppDelay.php |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 9a295a035..7399e15bc 100644
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -2170,7 +2170,7 @@ class wsBase
      */
     function executeTriggerFromDerivate($appData, $tasUid, $stepType, $stepUidObj, $triggerType, $labelAssigment = '')
     {
-        $varTriggers = "\n";
+        $varTriggers = "";
         $oCase = new Cases();
 
         //Execute triggers before assignment
@@ -2223,7 +2223,7 @@ class wsBase
 
     /**
      * Derivate Case moves the case to the next task in the process according to the routing rules
-     *
+     * This function is used from: action by email, web entry, PMFDerivateCase, Mobile
      * @param string $userId
      * @param string $caseId
      * @param string $delIndex
@@ -2318,13 +2318,14 @@ class wsBase
                 $previousAppData = $oPMScript->aFields;
             }
 
+            $varTriggers = "\n";
             //Execute triggers before assignment
             if ($bExecuteTriggersBeforeAssignment) {
-                $varTriggers = $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -1, 'BEFORE', "-= Before Assignment =-");
+                $varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -1, 'BEFORE', "-= Before Assignment =-");
             }
 
             //Execute triggers before routing
-            $varTriggers = $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE', "-= Before Derivation =-");
+            $varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'BEFORE', "-= Before Derivation =-");
 
             $oDerivation = new Derivation();
             if (!empty($tasks)) {
@@ -2414,7 +2415,7 @@ class wsBase
             $appFields = $oCase->loadCase( $caseId );
 
             //Execute triggers after routing
-            $varTriggers = $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-");
+            $varTriggers .= $this->executeTriggerFromDerivate($appFields["APP_DATA"], $appdel['TAS_UID'], 'ASSIGN_TASK', -2, 'AFTER', "-= After Derivation =-");
 
             $sFromName = "";
 
diff --git a/workflow/engine/classes/model/AppDelay.php b/workflow/engine/classes/model/AppDelay.php
index 156886c57..d2aa9dc85 100644
--- a/workflow/engine/classes/model/AppDelay.php
+++ b/workflow/engine/classes/model/AppDelay.php
@@ -124,7 +124,6 @@ class AppDelay extends BaseAppDelay
         $oCriteria = new Criteria( 'workflow' );
         $oCriteria->addSelectColumn( AppDelayPeer::APP_UID );
         $oCriteria->addSelectColumn( AppDelayPeer::APP_DEL_INDEX );
-        $oCriteria->add( AppDelayPeer::APP_TYPE, '' );
         $oCriteria->add( AppDelayPeer::APP_UID, $appUid );
         $oCriteria->add( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'PAUSE' )->addOr( $oCriteria->getNewCriterion( AppDelayPeer::APP_TYPE, 'CANCEL' ) ) );
         $oCriteria->addAscendingOrderByColumn( AppDelayPeer::APP_ENABLE_ACTION_DATE );