fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #703 from brayanpereyra/BUG-6947

Browse Source 
BUG 6947 I add validation to delete inputs with permission
This commit is contained in:
julceslauhub
2012-10-10 08:40:54 -07:00
parent 95c1bb1851 93cac85a54
commit 64519b4af0
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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');

1
workflow/engine/methods/cases/cases_Step.php
View File

@@ -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

1
workflow/engine/templates/cases/paged-table-inputDocuments.html
View File

@@ -181,6 +181,5 @@ function toggleMasterDetailGroup(tablename,groupName,imgicon){
}
}
document.getElementById('mainlabel').innerHTML = documentName;
</script>
<!-- END IGNORE -->