From c6c9c19cd194c1b5ff1d44d902bf7b071daeca4a Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Thu, 27 Mar 2014 16:20:14 -0400 Subject: [PATCH 1/5] Se modifica POST outputdocument, warning cuando se manda contenido vacio (DOMDocument::loadHTML error) --- .../engine/src/BusinessModel/Cases/OutputDocument.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/workflow/engine/src/BusinessModel/Cases/OutputDocument.php b/workflow/engine/src/BusinessModel/Cases/OutputDocument.php index b1ac382bb..8683d1e36 100644 --- a/workflow/engine/src/BusinessModel/Cases/OutputDocument.php +++ b/workflow/engine/src/BusinessModel/Cases/OutputDocument.php @@ -408,7 +408,13 @@ class OutputDocument switch ($aProperties['report_generator']) { case 'TCPDF': $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; case 'HTML2PDF': default: From c164c42257a6c931a006e90230b54ed6e7f3cb6d Mon Sep 17 00:00:00 2001 From: Daniel Rojas Date: Thu, 27 Mar 2014 16:48:23 -0400 Subject: [PATCH 2/5] Se agrega validacion para PUT project OUTPUT DOCUMENTS --- workflow/engine/src/BusinessModel/OutputDocument.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow/engine/src/BusinessModel/OutputDocument.php b/workflow/engine/src/BusinessModel/OutputDocument.php index 438c445d4..993180ff8 100644 --- a/workflow/engine/src/BusinessModel/OutputDocument.php +++ b/workflow/engine/src/BusinessModel/OutputDocument.php @@ -306,6 +306,9 @@ class OutputDocument if ($oOutputDocument->validate()) { $oConnection->begin(); 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']); } if (isset($aData['OUT_DOC_DESCRIPTION'])) { From bb1dcceae4df311d219e7b2146723cdc9cdc8ce1 Mon Sep 17 00:00:00 2001 From: Omar Date: Thu, 27 Mar 2014 17:16:38 -0400 Subject: [PATCH 3/5] Updating index.html for the designer --- workflow/engine/templates/designer/index.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index 4cb8238ac..10755be86 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -67,23 +67,25 @@ {/if} -