diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 9474b5ab4..1e69195ad 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -3551,29 +3551,39 @@ class processMap { * @return boolean true */ function newObjectPermission($sProcessUID) { - $aUsersGroups = array(); - $aUsersGroups [] = array('UID' => 'char', 'LABEL' => 'char'); + $usersGroups = ''; $aAllObjects = array(); $aAllObjects [] = array('UID' => 'char', 'LABEL' => 'char'); $aAllDynaforms = array(); @@ -3617,7 +3627,6 @@ class processMap { } global $_DBArray; $_DBArray = (isset($_SESSION ['_DBArray']) ? $_SESSION ['_DBArray'] : ''); - $_DBArray ['usersGroups'] = $aUsersGroups; $_DBArray ['allObjects'] = $aAllObjects; $_DBArray ['allDynaforms'] = $aAllDynaforms; $_DBArray ['allInputs'] = $aAllInputs; @@ -3625,7 +3634,7 @@ class processMap { $_SESSION ['_DBArray'] = $_DBArray; global $G_PUBLISH; $G_PUBLISH = new Publisher ( ); - $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_NewObjectPermission', '', array('LANG' => SYS_LANG, 'PRO_UID' => $sProcessUID, 'ID_DELETE' => G::LoadTranslation('ID_DELETE')), 'processes_SaveObjectPermission'); + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_NewObjectPermission', '', array('GROUP_USER' => $usersGroups, 'LANG' => SYS_LANG, 'PRO_UID' => $sProcessUID, 'ID_DELETE' => G::LoadTranslation('ID_DELETE')), 'processes_SaveObjectPermission'); G::RenderPage('publish', 'raw'); return true; } @@ -3661,7 +3670,6 @@ class processMap { $aFields ['PRO_UID'] = $aRows ['PRO_UID']; $aFields ['OP_CASE_STATUS'] = $aRows ['OP_CASE_STATUS']; $aFields ['TAS_UID'] = $aRows ['TAS_UID']; - $aFields ['GROUP_USER'] = $user; $aFields ['OP_TASK_SOURCE'] = $aRows ['OP_TASK_SOURCE']; $aFields ['OP_PARTICIPATE'] = $aRows ['OP_PARTICIPATE']; $aFields ['OP_OBJ_TYPE'] = $aRows ['OP_OBJ_TYPE']; @@ -3682,8 +3690,7 @@ class processMap { break; } - $aUsersGroups = array(); - $aUsersGroups [] = array('UID' => 'char', 'LABEL' => 'char'); + $usersGroups = ' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{$form.TITLE}
{$form.PRO_UID}
{$form.OP_UID}
{$OP_CASE_STATUS}{$form.OP_CASE_STATUS}
{$TAS_UID}{$form.TAS_UID}
{$GROUP_USER}{$form.GROUP_USER_DROPDOWN}
{$OP_TASK_SOURCE}{$form.OP_TASK_SOURCE}
{$OP_PARTICIPATE}{$form.OP_PARTICIPATE}
{$OP_OBJ_TYPE}{$form.OP_OBJ_TYPE}
{$ALL}{$form.ALL}
{$DYNAFORMS}{$form.DYNAFORMS}
{$INPUTS}{$form.INPUTS}
{$OUTPUTS}{$form.OUTPUTS}
{$OP_ACTION}{$form.OP_ACTION}
{$form.CREATE}
+ + + + +
+ + + \ No newline at end of file diff --git a/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml b/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml index 51636b081..ce37257b1 100755 --- a/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml +++ b/workflow/engine/xmlform/processes/processes_EditObjectPermission.xml @@ -1,8 +1,8 @@ - + <en>Edit Specific Permission</en> -<es><![CDATA[Nuevo permiso especĂ­fico]]></es> + @@ -13,109 +13,201 @@ - - Estado del Caso - - + + -Target Task + + + Target Task + + - -SELECT * FROM usersGroups + Group or User -Origin Task + + + + Origin Task Participation required? - Type - - - - + + + + + -SELECT * FROM allObjects - Object + SELECT * FROM allObjects + Object + + -SELECT * FROM allDynaforms + SELECT * FROM allDynaforms DynaForm -SELECT * FROM allInputs + SELECT * FROM allInputs Input Document -SELECT * FROM allOutputs + SELECT * FROM allOutputs Output Document - Permission + Permission + Save +
@@ -17,57 +17,57 @@ {$OP_CASE_STATUS} - {$form.OP_CASE_STATUS} + {$form.OP_CASE_STATUS} {$TAS_UID} - {$form.TAS_UID} + {$form.TAS_UID} {$GROUP_USER} - {$form.GROUP_USER} + {$form.GROUP_USER_DROPDOWN} {$OP_TASK_SOURCE} - {$form.OP_TASK_SOURCE} + {$form.OP_TASK_SOURCE} {$OP_PARTICIPATE} - {$form.OP_PARTICIPATE} + {$form.OP_PARTICIPATE} {$OP_OBJ_TYPE} - {$form.OP_OBJ_TYPE} + {$form.OP_OBJ_TYPE} {$ALL} - {$form.ALL} + {$form.ALL} {$DYNAFORMS} - {$form.DYNAFORMS} + {$form.DYNAFORMS} {$INPUTS} - {$form.INPUTS} + {$form.INPUTS} {$OUTPUTS} - {$form.OUTPUTS} + {$form.OUTPUTS} {$OP_ACTION} - {$form.OP_ACTION} + {$form.OP_ACTION}
{$form.CREATE}   {$form.BTN_CANCEL} @@ -82,4 +82,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml b/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml index 03aa118bf..785ef8ae9 100755 --- a/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml +++ b/workflow/engine/xmlform/processes/processes_NewObjectPermission.xml @@ -6,12 +6,14 @@ + - Status Case - - - - + Status Case + + + + + @@ -21,11 +23,13 @@ - - SELECT * FROM usersGroups + + Group or User + + Origin Task @@ -69,7 +73,7 @@ Create -CreateCriar + - \ No newline at end of file + \ No newline at end of file