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

GI-163

Browse Source 
Adding some changes and validations for code review
This commit is contained in:
jennydmz
2015-11-27 11:38:44 -04:00
parent bb4c1c2f14
commit e13a5a56b7
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.case.php
View File

@@ -2320,8 +2320,8 @@ class Cases
$oStep->getStepUidObj() . '&POSITION=' . $oStep->getStepPosition() .
'&ACTION=' . $sAction
);
$iPosition = $iLastStep;
}
$iPosition = $iLastStep;
}
}
$iPosition += 1;

2
workflow/engine/classes/class.labelsGmail.php
View File

@@ -169,7 +169,7 @@ class labelsGmail
try {
$service->users_labels->delete($user, $labelId);
} catch (Exception $e) {
print 'An error occurred: ' . $e->getMessage();
error_log('An error deleting gmail labels occurred: '.$e->getMessage());
}
}

10
workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
View File

@@ -17,10 +17,16 @@ class Pmgmail {
*/
public function getUserByEmail($usr_gmail)
{
//getting the user data
require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "model" . PATH_SEP . "Users.php");
$oUsers = new \Users();
$response = $oUsers->loadByUserEmailInArray($usr_gmail);
$response['user'] = $oUsers->loadByUserEmailInArray($usr_gmail);
//getting the skin
require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.system.php");
$sysConf = new \System();
$responseSysConfig = $sysConf->getSystemConfiguration( PATH_CONFIG . 'env.ini' );
$response['enviroment'] = $responseSysConfig['default_skin'];
return $response;
}