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

psr2

Browse Source
This commit is contained in:
Paula Quispe
2017-02-07 12:25:21 -04:00
parent 006650b7e9
commit a1de462bae
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -1029,13 +1029,13 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
); );
//Check if the user is a supervisor to this Process //Check if the user is a supervisor to this Process
if(isset($_POST['actionFromList']) && $_POST['actionFromList']==='to_revise'){ if (isset($_POST['actionFromList']) && $_POST['actionFromList']==='to_revise') {
if(!$aUserCanAccess['supervisor']){ if (!$aUserCanAccess['supervisor']) {
$response['exists'] = false; $response['exists'] = false;
$response['message'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED'); $response['message'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED');
} }
} else {//Check if the user participated in this case } else {//Check if the user participated in this case
if(!$aUserCanAccess['participated'] && !$aUserCanAccess['rolesPermissions']['PM_ALLCASES'] && !$aUserCanAccess['objectPermissions']['SUMMARY_FORM']){ if (!$aUserCanAccess['participated'] && !$aUserCanAccess['rolesPermissions']['PM_ALLCASES'] && !$aUserCanAccess['objectPermissions']['SUMMARY_FORM']) {
$response['exists'] = false; $response['exists'] = false;
$response['message'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED'); $response['message'] = G::LoadTranslation('ID_NO_PERMISSION_NO_PARTICIPATED');
} }

10
workflow/engine/methods/cases/cases_Resume.php
View File

@@ -141,19 +141,19 @@ $oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' ); $oHeadPublisher->addScriptFile( '/jscore/cases/core/cases_Step.js' );
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume.xml', '', $Fields, '' );
if($Fields['APP_STATUS'] != 'COMPLETED'){ if ($Fields['APP_STATUS'] != 'COMPLETED') {
$G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task_Title.xml', '', $Fields, '' ); $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'cases/cases_Resume_Current_Task_Title.xml', '', $Fields, '' );
$objDel = new AppDelegation(); $objDel = new AppDelegation();
$parallel = $objDel->LoadParallel($Fields['APP_UID']); $parallel = $objDel->LoadParallel($Fields['APP_UID']);
$FieldsPar = $Fields; $FieldsPar = $Fields;
foreach($parallel as $row){ foreach ($parallel as $row) {
$FieldsPar['TAS_UID'] = $row['TAS_UID']; $FieldsPar['TAS_UID'] = $row['TAS_UID'];
$aTask = $objTask->load( $row['TAS_UID'] ); $aTask = $objTask->load( $row['TAS_UID'] );
$FieldsPar['TAS_TITLE'] = $aTask['TAS_TITLE']; $FieldsPar['TAS_TITLE'] = $aTask['TAS_TITLE'];
$FieldsPar['USR_UID'] = $row['USR_UID']; $FieldsPar['USR_UID'] = $row['USR_UID'];
if(isset($row['USR_UID']) && !empty($row['USR_UID'])) { if (isset($row['USR_UID']) && !empty($row['USR_UID'])) {
$aUser = $objUser->loadDetails ($row['USR_UID']); $aUser = $objUser->loadDetails ($row['USR_UID']);
$FieldsPar['CURRENT_USER'] = $aUser['USR_FULLNAME']; $FieldsPar['CURRENT_USER'] = $aUser['USR_FULLNAME'];
} }
$FieldsPar['DEL_DELEGATE_DATE'] = $row['DEL_DELEGATE_DATE']; $FieldsPar['DEL_DELEGATE_DATE'] = $row['DEL_DELEGATE_DATE'];
$FieldsPar['DEL_INIT_DATE'] = $row['DEL_INIT_DATE']; $FieldsPar['DEL_INIT_DATE'] = $row['DEL_INIT_DATE'];

8
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
View File

@@ -3263,7 +3263,7 @@ class Cases
* @param array $objectPermissions * @param array $objectPermissions
* @return array Returns array with all access * @return array Returns array with all access
*/ */
public static function userAuthorization($usrUid, $proUid, $appUid, $rolesPermissions=array(), $objectPermissions=array()){ public function userAuthorization($usrUid, $proUid, $appUid, $rolesPermissions=array(), $objectPermissions=array()){
$arrayAccess = array(); $arrayAccess = array();
//User has participated //User has participated
@@ -3277,7 +3277,7 @@ class Cases
$arrayAccess['supervisor'] = (!in_array($proUid, $aProcesses)) ? false : true; $arrayAccess['supervisor'] = (!in_array($proUid, $aProcesses)) ? false : true;
//Roles Permissions //Roles Permissions
if (sizeof($rolesPermissions)) { if (count($rolesPermissions)>0) {
global $RBAC; global $RBAC;
foreach ($rolesPermissions as $value) { foreach ($rolesPermissions as $value) {
$arrayAccess['rolesPermissions'][$value] = ($RBAC->userCanAccess($value) < 0) ? false : true; $arrayAccess['rolesPermissions'][$value] = ($RBAC->userCanAccess($value) < 0) ? false : true;
@@ -3285,11 +3285,11 @@ class Cases
} }
//Object Permissions //Object Permissions
if (sizeof($objectPermissions)) { if (count($objectPermissions) > 0) {
$oCase = new \Cases(); $oCase = new \Cases();
foreach ($objectPermissions as $key => $value) { foreach ($objectPermissions as $key => $value) {
$resPermission = $oCase->getAllObjectsFrom($proUid, $appUid, '', $usrUid, $value); $resPermission = $oCase->getAllObjectsFrom($proUid, $appUid, '', $usrUid, $value);
if(isset($resPermission[$key])){ if (isset($resPermission[$key])) {
$arrayAccess['objectPermissions'][$key] = $resPermission[$key]; $arrayAccess['objectPermissions'][$key] = $resPermission[$key];
} }
} }