From 8f164129d77d431cc730a983abde93ceb4f5b67b Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 8 May 2015 10:27:40 -0400
Subject: [PATCH 1/2] PM-2639 Home > Process Supervisor > Reassign: Al
 reasignar un caso se muestra a "Administrator" dos veces.

---
 workflow/engine/classes/class.case.php            | 15 +++++++++++++++
 .../methods/cases/proxyReassignUsersList.php      | 15 +++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index c64c1ab15..8fcb73a32 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -6793,6 +6793,21 @@ class Cases
                 }
             }
         }
+
+        if(count($rows) != 0){
+            foreach ($rows as $key => $value) {
+                $arrayKey[$key] = $value['USR_UID'];
+            }
+            $arrayKey = array_unique($arrayKey);
+            $keys = array_keys($arrayKey);
+            foreach ($rows as $key => $value){
+                if(!in_array($key, $keys)){
+                    unset($rows[$key]);
+                }
+            }
+            $rows = array_values($rows);
+        }
+
         return $rows;
     }
 
diff --git a/workflow/engine/methods/cases/proxyReassignUsersList.php b/workflow/engine/methods/cases/proxyReassignUsersList.php
index 5b8a7cbe9..9f507ec47 100755
--- a/workflow/engine/methods/cases/proxyReassignUsersList.php
+++ b/workflow/engine/methods/cases/proxyReassignUsersList.php
@@ -52,6 +52,21 @@ function array_sort ($array, $on, $order = SORT_ASC, $query = '')
             }
         }
     }
+
+    if(count($new_array) != 0){
+        foreach ($new_array as $key => $value) {
+            $arrayKey[$key] = $value['userUid'];
+        }
+        $arrayKey = array_unique($arrayKey);
+        $keys = array_keys($arrayKey);
+        foreach ($new_array as $key => $value){
+            if(!in_array($key, $keys)){
+                unset($new_array[$key]);
+            }
+        }
+        $new_array = array_values($new_array);
+    }
+    
     return $new_array;
 }
 //  $APP_UIDS          = explode(',', $_POST['APP_UID']);

From c21b6ca59d81946afdc5e9d0347326cc2674a19d Mon Sep 17 00:00:00 2001
From: dheeyi <dheeyi@gmail.com>
Date: Fri, 15 May 2015 15:26:56 -0400
Subject: [PATCH 2/2] PM-2639

---
 workflow/engine/classes/class.case.php        | 26 ++++++-------------
 .../methods/cases/proxyReassignUsersList.php  | 14 ----------
 2 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 8fcb73a32..978ecdb30 100755
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -6740,7 +6740,7 @@ class Cases
             $rows[] = $rs->getRow();
         }
 
-        if ($PRO_UID != null) {
+        if ($PRO_UID != null) {            
             //Add supervisor
             // Users
             $oCriteria = new Criteria('workflow');
@@ -6760,8 +6760,10 @@ class Cases
             $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
             $flagSupervisors = false;
 
-            if ($oDataset->next()) {
-                $rows[] = $oDataset->getRow();
+            if ($oDataset->next()) {         
+                if (!in_array($USR_UID,$row)) {
+                        $rows[] = $oDataset->getRow();
+                }       
                 $flagSupervisors = true;
             }
 
@@ -6789,25 +6791,13 @@ class Cases
                 $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
                 if ($oDataset->next()) {
-                    $rows[] = $oDataset->getRow();
+                    if (!in_array($USR_UID,$row)) {
+                        $rows[] = $oDataset->getRow();
+                    }
                 }
             }
         }
 
-        if(count($rows) != 0){
-            foreach ($rows as $key => $value) {
-                $arrayKey[$key] = $value['USR_UID'];
-            }
-            $arrayKey = array_unique($arrayKey);
-            $keys = array_keys($arrayKey);
-            foreach ($rows as $key => $value){
-                if(!in_array($key, $keys)){
-                    unset($rows[$key]);
-                }
-            }
-            $rows = array_values($rows);
-        }
-
         return $rows;
     }
 
diff --git a/workflow/engine/methods/cases/proxyReassignUsersList.php b/workflow/engine/methods/cases/proxyReassignUsersList.php
index 9f507ec47..ae662cbd5 100755
--- a/workflow/engine/methods/cases/proxyReassignUsersList.php
+++ b/workflow/engine/methods/cases/proxyReassignUsersList.php
@@ -52,20 +52,6 @@ function array_sort ($array, $on, $order = SORT_ASC, $query = '')
             }
         }
     }
-
-    if(count($new_array) != 0){
-        foreach ($new_array as $key => $value) {
-            $arrayKey[$key] = $value['userUid'];
-        }
-        $arrayKey = array_unique($arrayKey);
-        $keys = array_keys($arrayKey);
-        foreach ($new_array as $key => $value){
-            if(!in_array($key, $keys)){
-                unset($new_array[$key]);
-            }
-        }
-        $new_array = array_values($new_array);
-    }
     
     return $new_array;
 }