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

Merged in paulis/processmaker/HOR-1877 (pull request #4929)

Browse Source 
HOR-1877
This commit is contained in:
Julio Cesar Laura Avendaño
2016-09-21 11:42:03 -04:00
parent cd3d914360 af491f6a53
commit d1d9ae23ef
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -697,6 +697,7 @@ class pmDynaform
window.dynaform = new PMDynaform.core.Project({ window.dynaform = new PMDynaform.core.Project({
data: data, data: data,
delIndex: delIndex, delIndex: delIndex,
dynaformUid: dyn_uid,
keys: { keys: {
server: httpServerHostname, server: httpServerHostname,
projectId: prj_uid, projectId: prj_uid,
@@ -755,6 +756,7 @@ class pmDynaform
" window.dynaform = new PMDynaform.core.Project({\n" . " window.dynaform = new PMDynaform.core.Project({\n" .
" data: data,\n" . " data: data,\n" .
" delIndex: delIndex,\n" . " delIndex: delIndex,\n" .
" dynaformUid: dyn_uid,\n" .
" keys: {\n" . " keys: {\n" .
" server: httpServerHostname,\n" . " server: httpServerHostname,\n" .
" projectId: prj_uid,\n" . " projectId: prj_uid,\n" .

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

@@ -38,7 +38,19 @@ class Cases extends Api
case 'doGetCaseVariables': case 'doGetCaseVariables':
$applicationUid = $this->parameters[$arrayArgs['app_uid']]; $applicationUid = $this->parameters[$arrayArgs['app_uid']];
$dynaformUid = $this->parameters[$arrayArgs['dyn_uid']]; $dynaformUid = $this->parameters[$arrayArgs['dyn_uid']];
$delIndex = $this->parameters[$arrayArgs['app_index']];
$userUid = $this->getUserId(); $userUid = $this->getUserId();
//Check if the user has the case
$appDelegation = new \AppDelegation();
$aCurUser = $appDelegation->getCurrentUsers($applicationUid, $delIndex);
if (!empty($aCurUser)) {
foreach ($aCurUser as $key => $value) {
if ($value === $userUid) {
return true;
}
}
}
//Check if the user has Permissions
$oCases = new \ProcessMaker\BusinessModel\Cases(); $oCases = new \ProcessMaker\BusinessModel\Cases();
return $oCases->checkUserHasPermissionsOrSupervisor($userUid, $applicationUid, $dynaformUid); return $oCases->checkUserHasPermissionsOrSupervisor($userUid, $applicationUid, $dynaformUid);
break; break;