diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 406d1e863..57f40c482 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -3278,6 +3278,13 @@ class Cases public function getInputDocumentsCriteria($sApplicationUID, $iDelegation, $sDocumentUID, $sAppDocuUID = '') { try { + $deletePermission = $this->getAllObjectsFrom( + $_SESSION['PROCESS'], + $sApplicationUID, + $_SESSION['TASK'], + $_SESSION['USER_LOGGED'], + $ACTION = 'DELETE' + ); $listing = false; $oPluginRegistry = & PMPluginRegistry::getSingleton(); if ($oPluginRegistry->existsTrigger(PM_CASE_DOCUMENT_LIST)) { @@ -3333,11 +3340,10 @@ class Cases $aFields['POSITION'] = isset($_SESSION['STEP_POSITION']) ? $_SESSION['STEP_POSITION'] : 1; $aFields['CONFIRM'] = G::LoadTranslation('ID_CONFIRM_DELETE_INPUT_AND_HISTORY'); - //if (in_array($aRow['APP_DOC_UID'], $aDelete['INPUT_DOCUMENTS'])) { - // $aFields['ID_DELETE'] = G::LoadTranslation('ID_DELETE'); - //} - $aFields['ID_DELETE'] = G::LoadTranslation('ID_DELETE'); - + $aFields['ID_DELETE'] = ''; + if (in_array($aRow['APP_DOC_UID'], $deletePermission['INPUT_DOCUMENTS'])) { + $aFields['ID_DELETE'] = G::LoadTranslation('ID_DELETE'); + } $aFields['REPLACE_LABEL'] = ""; if (($aRow['DOC_VERSION'] == $lastVersion) || ($sAppDocuUID != "")) { $aFields['REPLACE_LABEL'] = G::LoadTranslation('ID_REPLACE'); diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php index 0f3131263..9967c0e22 100755 --- a/workflow/engine/methods/cases/cases_Step.php +++ b/workflow/engine/methods/cases/cases_Step.php @@ -274,7 +274,6 @@ $oPluginRegistry->executeTriggers ( PM_UPLOAD_DOCUMENT_BEFORE , array('USR_UID'=>$_SESSION['USER_LOGGED']) ); } //END: If there is a Break Step registered from Plugin - $G_PUBLISH->AddContent('propeltable', 'cases/paged-table-inputDocuments', 'cases/cases_InputdocsList', $oCase->getInputDocumentsCriteria($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_GET['UID']), array_merge(array('DOC_UID'=>$_GET['UID']),$Fields));//$aFields //call plugin diff --git a/workflow/engine/templates/cases/paged-table-inputDocuments.html b/workflow/engine/templates/cases/paged-table-inputDocuments.html index 74fa0c7d7..cb2933d19 100755 --- a/workflow/engine/templates/cases/paged-table-inputDocuments.html +++ b/workflow/engine/templates/cases/paged-table-inputDocuments.html @@ -181,6 +181,5 @@ function toggleMasterDetailGroup(tablename,groupName,imgicon){ } } document.getElementById('mainlabel').innerHTML = documentName; -