From e368111e7d561531adc0adcca6c1a01e6ffbe5e1 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Wed, 21 Sep 2016 18:12:42 -0400
Subject: [PATCH] HOR-1919

---
 .../methods/cases/casesListExtJsRedirector.php     |  3 +--
 workflow/engine/methods/cases/cases_Derivate.php   |  3 +--
 workflow/engine/methods/cases/derivatedGmail.php   |  7 +++++--
 .../engine/src/ProcessMaker/Services/Api/Cases.php | 14 +++++++-------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php
index d0297d63b..3948f5987 100644
--- a/workflow/engine/methods/cases/casesListExtJsRedirector.php
+++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php
@@ -23,8 +23,7 @@ if (isset( $_GET['ux'] )) {
     }
 /*----------------------------------********---------------------------------*/
 } else if( $statusPMGmail ){
-    $uex = isset($_GET['uex']) ? '?uex=' . $_GET['uex'] : '';
-    $url = $pathDerivateGmail . $uex;
+    $url = $pathDerivateGmail;
 /*----------------------------------********---------------------------------*/
 } else {
     $url = 'casesListExtJs';
diff --git a/workflow/engine/methods/cases/cases_Derivate.php b/workflow/engine/methods/cases/cases_Derivate.php
index 8b531ab19..9aa0772e6 100644
--- a/workflow/engine/methods/cases/cases_Derivate.php
+++ b/workflow/engine/methods/cases/cases_Derivate.php
@@ -256,8 +256,7 @@ try {
         $aNextStep ['PAGE'] = $casesRedirector . '?ux=' . $_SESSION ['user_experience'];
         $debuggerAvailable = false;
     } else if ($flagGmail === true) {
-        $ux = isset($_SESSION ['user_experience']) ? '&uex=' . $_SESSION ['user_experience'] : '';
-        $aNextStep ['PAGE'] = $casesRedirector . '?gmail=1' . $ux;
+        $aNextStep ['PAGE'] = $casesRedirector . '?gmail=1';
     } else {
         $aNextStep ['PAGE'] = $casesRedirector;
     }
diff --git a/workflow/engine/methods/cases/derivatedGmail.php b/workflow/engine/methods/cases/derivatedGmail.php
index 76b30f121..9203ceeed 100644
--- a/workflow/engine/methods/cases/derivatedGmail.php
+++ b/workflow/engine/methods/cases/derivatedGmail.php
@@ -1,4 +1,4 @@
-<?php
+<?php 
 $licensedFeatures = & PMLicensedFeatures::getSingleton();
 if (!$licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
     G::SendTemporalMessage( 'ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels' );
@@ -28,7 +28,10 @@ if(array_key_exists('gmail', $_SESSION) && $_SESSION['gmail'] == 1 && $pmGoogle-
 	unset($_SESSION['gmail']); //cleaning session
 	$mUrl = '/sys'. $_SESSION['WORKSPACE'] .'/en/'.$_SESSION['currentSkin'].'/cases/cases_Open?APP_UID='.$caseId.'&DEL_INDEX='.$actualIndex.'&action=sent';
 } else{
-        $mUrl = isset($_GET['uex']) ? '../home' : 'casesListExtJs';
+	$mUrl = 'casesListExtJs';
+        if (isset($_SESSION["currentSkin"]) && $_SESSION["currentSkin"] === 'uxs') {
+            $mUrl = '../home';
+        }
 }
 
 header( 'location:' . $mUrl );
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php
index 95e5890e2..9fcdb2635 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php
@@ -69,15 +69,15 @@ class Cases extends Api
                         $arrayApplicationData = $case->getApplicationRecordByPk($value['APP_UID'], [], false);
 
                         if (!empty($arrayApplicationData)) {
-                            $supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor();
-                            $flagps = $supervisor->isUserProcessSupervisor($arrayApplicationData['PRO_UID'], $usrUid);
+                            if (!$user->checkPermission($usrUid, 'PM_REASSIGNCASE')) {
+                                if($user->checkPermission($usrUid, 'PM_REASSIGNCASE_SUPERVISOR')){
+                                    $supervisor = new \ProcessMaker\BusinessModel\ProcessSupervisor();
+                                    $flagps = $supervisor->isUserProcessSupervisor($arrayApplicationData['PRO_UID'], $usrUid);
+                                    if(!$flagps){
+                                        $count = $count + 1;
+                                    }
 
-                            if ($flagps) {
-                                if (!$user->checkPermission($usrUid, 'PM_REASSIGNCASE')) {
-                                    $count = $count + 1;
                                 }
-                            } else {
-                                $count = $count + 1;
                             }
                         }
                     }