fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-1919

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2016-09-21 18:12:42 -04:00
parent bb8f804d8d
commit e368111e7d
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/methods/cases/casesListExtJsRedirector.php
View File

@@ -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';

3
workflow/engine/methods/cases/cases_Derivate.php
View File

@@ -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;
}

7
workflow/engine/methods/cases/derivatedGmail.php
View File

@@ -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 );

14
workflow/engine/src/ProcessMaker/Services/Api/Cases.php
View File

@@ -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;
}
}
}