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

I solve the issue PM-2317

Browse Source
This commit is contained in:
Paula V. Quispe
2015-04-14 14:50:51 -04:00
parent c3125a5e7a
commit c9c630b824
2 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
workflow/engine/classes/model/InputDocument.php
View File

@@ -150,8 +150,15 @@ class InputDocument extends BaseInputDocument
if(!empty($aData['INP_DOC_DESTINATION_PATH'])){ if(!empty($aData['INP_DOC_DESTINATION_PATH'])){
$description .= ", Destination Path: ".$aData['INP_DOC_DESTINATION_PATH']; $description .= ", Destination Path: ".$aData['INP_DOC_DESTINATION_PATH'];
} }
$inputDocMaxFileSize = $aData['INP_DOC_MAX_FILESIZE']? $aData['INP_DOC_MAX_FILESIZE'].' '.$aData['INP_DOC_MAX_FILESIZE_UNIT'] : "256 MB"; $inputDocMaxFileSize = "";
$description .= ", Extensions: ".$aData['INP_DOC_TYPE_FILE'].", Maximum Input Document file size: ".$inputDocMaxFileSize; if(!empty($aData['INP_DOC_MAX_FILESIZE'])){
$inputDocMaxFileSize = $aData['INP_DOC_MAX_FILESIZE']? $aData['INP_DOC_MAX_FILESIZE'].' '.$aData['INP_DOC_MAX_FILESIZE_UNIT'] : "256 MB";
$inputDocMaxFileSize = ", Maximum Input Document file size: ".$inputDocMaxFileSize;
}
if(!empty($aData['INP_DOC_MAX_FILESIZE'])){
$description .= ", Extensions: ".$aData['INP_DOC_TYPE_FILE'];
}
$description .= $inputDocMaxFileSize;
G::auditLog("CreateInputDocument", $description); G::auditLog("CreateInputDocument", $description);
return $aData['INP_DOC_UID']; return $aData['INP_DOC_UID'];
@@ -217,8 +224,15 @@ class InputDocument extends BaseInputDocument
if(!empty($aData['INP_DOC_DESTINATION_PATH'])){ if(!empty($aData['INP_DOC_DESTINATION_PATH'])){
$description .= ", Destination Path: ".$aData['INP_DOC_DESTINATION_PATH']; $description .= ", Destination Path: ".$aData['INP_DOC_DESTINATION_PATH'];
} }
$inputDocMaxFileSize = $aData['INP_DOC_MAX_FILESIZE']? $aData['INP_DOC_MAX_FILESIZE'].' '.$aData['INP_DOC_MAX_FILESIZE_UNIT'] : "256 MB"; $inputDocMaxFileSize = "";
$description .= ", Extensions: ".$aData['INP_DOC_TYPE_FILE'].", Maximum Input Document file size: ".$inputDocMaxFileSize; if(!empty($aData['INP_DOC_MAX_FILESIZE'])){
$inputDocMaxFileSize = $aData['INP_DOC_MAX_FILESIZE']? $aData['INP_DOC_MAX_FILESIZE'].' '.$aData['INP_DOC_MAX_FILESIZE_UNIT'] : "256 MB";
$inputDocMaxFileSize = ", Maximum Input Document file size: ".$inputDocMaxFileSize;
}
if(!empty($aData['INP_DOC_MAX_FILESIZE'])){
$description .= ", Extensions: ".$aData['INP_DOC_TYPE_FILE'];
}
$description .= $inputDocMaxFileSize;
G::auditLog("UpdateInputDocument", $description); G::auditLog("UpdateInputDocument", $description);
return $iResult; return $iResult;

42
workflow/engine/classes/model/OutputDocument.php
View File

@@ -178,7 +178,12 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_DESCRIPTION'])){ if(!empty($aData['OUT_DOC_DESCRIPTION'])){
$description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION']; $description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
} }
$description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'].", Output Document to Generate: ".$aData['OUT_DOC_GENERATE']; if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'];
}
if(!empty($aData['OUT_DOC_GENERATE'])){
$description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
}
if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){ if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){
$pdfSecurity = 'Disabled'; $pdfSecurity = 'Disabled';
}else{ }else{
@@ -194,12 +199,14 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_TAGS'])){ if(!empty($aData['OUT_DOC_TAGS'])){
$description .= ", Tags: ".$aData['OUT_DOC_TAGS']; $description .= ", Tags: ".$aData['OUT_DOC_TAGS'];
} }
if($aData['OUT_DOC_OPEN_TYPE']==0){ if(!empty($aData['OUT_DOC_OPEN_TYPE'])){
$genLink = 'Open the file'; if($aData['OUT_DOC_OPEN_TYPE']==0){
}else{ $genLink = 'Open the file';
$genLink = 'Download the file'; }else{
} $genLink = 'Download the file';
$description .= ", By clicking on the generated file link: ".$genLink; }
$description .= ", By clicking on the generated file link: ".$genLink;
}
G::auditLog("CreateOutputDocument", $description); G::auditLog("CreateOutputDocument", $description);
return $aData['OUT_DOC_UID']; return $aData['OUT_DOC_UID'];
@@ -261,7 +268,12 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_DESCRIPTION'])){ if(!empty($aData['OUT_DOC_DESCRIPTION'])){
$description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION']; $description .= ", Description: ".$aData['OUT_DOC_DESCRIPTION'];
} }
$description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'].", Output Document to Generate: ".$aData['OUT_DOC_GENERATE']; if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Report Generator: ". $aData['OUT_DOC_REPORT_GENERATOR'];
}
if(!empty($aData['OUT_DOC_REPORT_GENERATOR'])){
$description .= ", Output Document to Generate: ".$aData['OUT_DOC_GENERATE'];
}
if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){ if($aData['OUT_DOC_PDF_SECURITY_ENABLED']==0){
$pdfSecurity = 'Disabled'; $pdfSecurity = 'Disabled';
}else{ }else{
@@ -277,12 +289,14 @@ class OutputDocument extends BaseOutputDocument
if(!empty($aData['OUT_DOC_TAGS'])){ if(!empty($aData['OUT_DOC_TAGS'])){
$description .= ", Tags: ".$aData['OUT_DOC_TAGS']; $description .= ", Tags: ".$aData['OUT_DOC_TAGS'];
} }
if($aData['OUT_DOC_OPEN_TYPE']==0){ if(!empty($aData['OUT_DOC_OPEN_TYPE'])){
$genLink = 'Open the file'; if($aData['OUT_DOC_OPEN_TYPE']==0){
}else{ $genLink = 'Open the file';
$genLink = 'Download the file'; }else{
} $genLink = 'Download the file';
$description .= ", By clicking on the generated file link: ".$genLink; }
$description .= ", By clicking on the generated file link: ".$genLink;
}
if (isset($aData['OUT_DOC_TEMPLATE'])) { if (isset($aData['OUT_DOC_TEMPLATE'])) {
$description .= ", [EDIT TEMPLATE]"; $description .= ", [EDIT TEMPLATE]";
} }