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

HOR-651 Permissions Error

Browse Source
This commit is contained in:
dheeyi
2016-03-30 17:23:54 -04:00
parent eadca40d08
commit fa5109841b
2 changed files with 134 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5114,12 +5114,12 @@ class Cases
* @return object * @return object
*/ */
public function getallDynaformsCriteria($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID) public function getallDynaformsCriteria($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID, $delIndex = 0)
{ {
//check OBJECT_PERMISSION table //check OBJECT_PERMISSION table
$this->verifyTable(); $this->verifyTable();
$aObjectPermissions = $this->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID); $aObjectPermissions = $this->getAllObjects($sProcessUID, $sApplicationUID, $sTasKUID, $sUserUID, $delIndex);
if (!is_array($aObjectPermissions)) { if (!is_array($aObjectPermissions)) {
$aObjectPermissions = array( $aObjectPermissions = array(
'DYNAFORMS' => array(-1), 'DYNAFORMS' => array(-1),
@@ -5519,14 +5519,14 @@ class Cases
* @param Process ID, Application ID, Task ID and User ID * @param Process ID, Application ID, Task ID and User ID
* @return Array within all user permitions all objects' types * @return Array within all user permitions all objects' types
*/ */
public function getAllObjects($PRO_UID, $APP_UID, $TAS_UID = '', $USR_UID = '') public function getAllObjects($PRO_UID, $APP_UID, $TAS_UID = '', $USR_UID = '', $delIndex = 0)
{ {
$ACTIONS = Array('VIEW', 'BLOCK', 'DELETE'); //TO COMPLETE $ACTIONS = Array('VIEW', 'BLOCK', 'DELETE'); //TO COMPLETE
$MAIN_OBJECTS = Array(); $MAIN_OBJECTS = Array();
$RESULT_OBJECTS = Array(); $RESULT_OBJECTS = Array();
foreach ($ACTIONS as $action) { foreach ($ACTIONS as $action) {
$MAIN_OBJECTS[$action] = $this->getAllObjectsFrom($PRO_UID, $APP_UID, $TAS_UID, $USR_UID, $action); $MAIN_OBJECTS[$action] = $this->getAllObjectsFrom($PRO_UID, $APP_UID, $TAS_UID, $USR_UID, $action, $delIndex);
} }
/* ADDITIONAL OPERATIONS */ /* ADDITIONAL OPERATIONS */
/* * * BETWEN VIEW AND BLOCK** */ /* * * BETWEN VIEW AND BLOCK** */

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

@@ -49,7 +49,8 @@ if ($actionAjax == 'historyDynaformGrid_Ajax') {
$oCase = new Cases(); $oCase = new Cases();
$aProcesses = Array (); $aProcesses = Array ();
$c = $oCase->getallDynaformsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['CURRENT_TASK'], $_SESSION['USER_LOGGED'] ); $c = $oCase->getallDynaformsCriteria( $_SESSION['PROCESS'], $_SESSION['APPLICATION'], $_SESSION['CURRENT_TASK'],
$_SESSION['USER_LOGGED'] , $_SESSION['INDEX']);
if ($c->getDbName() == 'dbarray') { if ($c->getDbName() == 'dbarray') {
$rs = ArrayBasePeer::doSelectRs( $c ); $rs = ArrayBasePeer::doSelectRs( $c );