fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in darojas/processmaker (pull request #343)

Browse Source 
Se modifica POST outputdocument, warning cuando se manda contenido vacio (DOMDocument::loadHTML error). Se agrega validacion para PUT project OUTPUT DOCUMENTS
This commit is contained in:
erik ao
2014-03-27 19:18:54 -04:00
parent 00fd862056 c164c42257
commit 574315224b
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/src/BusinessModel/Cases/OutputDocument.php
View File

@@ -408,7 +408,13 @@ class OutputDocument
switch ($aProperties['report_generator']) { switch ($aProperties['report_generator']) {
case 'TCPDF': case 'TCPDF':
$o = new \OutputDocument(); $o = new \OutputDocument();
$o->generateTcpdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties); if (strlen($sContent) == 0) {
libxml_use_internal_errors(true);
$o->generateTcpdf($sUID, $aFields, $sPath, $sFilename, ' ', $sLandscape, $aProperties);
libxml_use_internal_errors(false);
} else {
$o->generateTcpdf($sUID, $aFields, $sPath, $sFilename, $sContent, $sLandscape, $aProperties);
}
break; break;
case 'HTML2PDF': case 'HTML2PDF':
default: default:

3
workflow/engine/src/BusinessModel/OutputDocument.php
View File

@@ -306,6 +306,9 @@ class OutputDocument
if ($oOutputDocument->validate()) { if ($oOutputDocument->validate()) {
$oConnection->begin(); $oConnection->begin();
if (isset($aData['OUT_DOC_TITLE'])) { if (isset($aData['OUT_DOC_TITLE'])) {
if ($this->existsTitle($sProcessUID, $aData["OUT_DOC_TITLE"])) {
throw (new \Exception(\G::LoadTranslation("ID_OUTPUT_NOT_SAVE")));
}
$oOutputDocument->setOutDocTitle($aData['OUT_DOC_TITLE']); $oOutputDocument->setOutDocTitle($aData['OUT_DOC_TITLE']);
} }
if (isset($aData['OUT_DOC_DESCRIPTION'])) { if (isset($aData['OUT_DOC_DESCRIPTION'])) {