From d2852175b60c619eae07b3579154b3e10d2e16ee Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Tue, 8 Dec 2015 11:58:34 -0400
Subject: [PATCH] PM-4315

PM-4315

PM-4315
---
 workflow/engine/classes/class.case.php                 |  9 ++++-----
 workflow/engine/classes/model/ListInbox.php            |  2 +-
 workflow/engine/classes/model/ListParticipatedLast.php | 10 ++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 460c0fab6..af91558f0 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -4492,6 +4492,7 @@ class Cases
         $iIndex = $oAppDelegation->createAppDelegation(
                 $aFieldsDel['PRO_UID'], $aFieldsDel['APP_UID'], $aFieldsDel['TAS_UID'], $aFieldsDel['USR_UID'], $aFieldsDel['DEL_THREAD']
         );
+        $newDelIndex = $iIndex;
         $aData = array();
         $aData['APP_UID'] = $aFieldsDel['APP_UID'];
         $aData['DEL_INDEX'] = $iIndex;
@@ -4532,14 +4533,12 @@ class Cases
         }
 
         /*----------------------------------********---------------------------------*/
-        $oCriteria = new Criteria('workflow');
-        $oCriteria->add(ListParticipatedLastPeer::APP_UID, $aData['APP_UID']);
-        $oCriteria->add(ListParticipatedLastPeer::USR_UID, $sUserUID);
-        $oCriteria->add(ListParticipatedLastPeer::DEL_INDEX, $iDelegation);
-        ListParticipatedLastPeer::doDelete($oCriteria);
+        $participated = new ListParticipatedLast();
+        $participated->remove($aData['APP_UID'], $newUserUID, $iDelegation);
 
         $aFieldsDel = array_merge($aData, $aFieldsDel);
         $aFieldsDel['USR_UID'] = $newUserUID;
+        $aFieldsDel['DEL_INDEX'] = $newDelIndex;
         $inbox = new ListInbox();
         $inbox->newRow($aFieldsDel, $sUserUID);
 
diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php
index a88cc8f4d..a5bdff3ad 100644
--- a/workflow/engine/classes/model/ListInbox.php
+++ b/workflow/engine/classes/model/ListInbox.php
@@ -24,7 +24,7 @@ class ListInbox extends BaseListInbox
      *
      */
     public function create($data, $isSelfService = false)
-    { 
+    {
         $con = Propel::getConnection( ListInboxPeer::DATABASE_NAME );
         try {
             if(isset($data['APP_TITLE'])) {
diff --git a/workflow/engine/classes/model/ListParticipatedLast.php b/workflow/engine/classes/model/ListParticipatedLast.php
index d2f9e34e6..020201962 100644
--- a/workflow/engine/classes/model/ListParticipatedLast.php
+++ b/workflow/engine/classes/model/ListParticipatedLast.php
@@ -170,26 +170,24 @@ class ListParticipatedLast extends BaseListParticipatedLast
                 $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
                 $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
                 $criteria->add(ListParticipatedLastPeer::DEL_INDEX, $del_index);
-                
+
                 if(!$this->isTheOne($app_uid, $usr_uid) || $force) {
                     $result = ListParticipatedLastPeer::doDelete($criteria);
+                    $flagDelete = true;
                 }
-
-                $flagDelete = true;
             } else {
                 $criteria = new Criteria("workflow");
 
                 $criteria->add(ListParticipatedLastPeer::APP_UID, $app_uid);
                 $criteria->add(ListParticipatedLastPeer::USR_UID, $usr_uid);
-
                 $rsCriteria = ListParticipatedLastPeer::doSelectRS($criteria);
 
                 if ($rsCriteria->next()) {
                     $criteria2 = clone $criteria;
-                    if(!$this->isTheOne($app_uid, $usr_uid) || $force) { 
+                    if(!$this->isTheOne($app_uid, $usr_uid) || $force) {
                         $result = ListParticipatedLastPeer::doDelete($criteria2);
+                        $flagDelete = true;
                     }
-                    $flagDelete = true;
                 }
             }