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

Fix BUG 14907: No se visualiza los cambios en el editor tiny de OutputDocuments. SOLVED

Browse Source
This commit is contained in:
Daniel Rojas
2014-05-15 13:13:45 -04:00
parent bdde62e17b
commit 7a2e46cee8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php
View File

@@ -83,6 +83,7 @@ class OutputDocument
'out_doc_title' => $aRow['OUT_DOC_TITLE'], 'out_doc_title' => $aRow['OUT_DOC_TITLE'],
'out_doc_description' => $aRow['OUT_DOC_DESCRIPTION'], 'out_doc_description' => $aRow['OUT_DOC_DESCRIPTION'],
'out_doc_filename' => $aRow['OUT_DOC_FILENAME'], 'out_doc_filename' => $aRow['OUT_DOC_FILENAME'],
'out_doc_template' => $aRow['OUT_DOC_TEMPLATE'],
'out_doc_report_generator' => $aRow['OUT_DOC_REPORT_GENERATOR'], 'out_doc_report_generator' => $aRow['OUT_DOC_REPORT_GENERATOR'],
'out_doc_landscape' => $aRow['OUT_DOC_LANDSCAPE'], 'out_doc_landscape' => $aRow['OUT_DOC_LANDSCAPE'],
'out_doc_media' => $aRow['OUT_DOC_MEDIA'], 'out_doc_media' => $aRow['OUT_DOC_MEDIA'],
@@ -190,6 +191,7 @@ class OutputDocument
'out_doc_title' => $aRow['OUT_DOC_TITLE'], 'out_doc_title' => $aRow['OUT_DOC_TITLE'],
'out_doc_description' => $aRow['OUT_DOC_DESCRIPTION'], 'out_doc_description' => $aRow['OUT_DOC_DESCRIPTION'],
'out_doc_filename' => $aRow['OUT_DOC_FILENAME'], 'out_doc_filename' => $aRow['OUT_DOC_FILENAME'],
'out_doc_template' => $aRow['OUT_DOC_TEMPLATE'],
'out_doc_report_generator' => $aRow['OUT_DOC_REPORT_GENERATOR'], 'out_doc_report_generator' => $aRow['OUT_DOC_REPORT_GENERATOR'],
'out_doc_landscape' => $aRow['OUT_DOC_LANDSCAPE'], 'out_doc_landscape' => $aRow['OUT_DOC_LANDSCAPE'],
'out_doc_media' => $aRow['OUT_DOC_MEDIA'], 'out_doc_media' => $aRow['OUT_DOC_MEDIA'],
@@ -241,10 +243,7 @@ class OutputDocument
$outputDocumentData = array_change_key_case($outputDocumentData, CASE_UPPER); $outputDocumentData = array_change_key_case($outputDocumentData, CASE_UPPER);
$outputDocumentData['PRO_UID'] = $sProcessUID; $outputDocumentData['PRO_UID'] = $sProcessUID;
//Verify data //Verify data
$process = new \Process(); Validator::proUid($sProcessUID, '$pro_uid');
if (!$process->exists($sProcessUID)) {
throw (new \Exception(str_replace(array("{0}", "{1}"), array($sProcessUID, "PROCESS"), "The UID \"{0}\" doesn't exist in table {1}")));
}
if ($outputDocumentData["OUT_DOC_TITLE"]=="") { if ($outputDocumentData["OUT_DOC_TITLE"]=="") {
throw (new \Exception( 'Invalid value specified for out_doc_title, can not be null')); throw (new \Exception( 'Invalid value specified for out_doc_title, can not be null'));
} }
@@ -329,6 +328,9 @@ class OutputDocument
if (isset($outputDocumentData['OUT_DOC_FILENAME'])) { if (isset($outputDocumentData['OUT_DOC_FILENAME'])) {
$oOutputDocument->setOutDocFilename($outputDocumentData['OUT_DOC_FILENAME']); $oOutputDocument->setOutDocFilename($outputDocumentData['OUT_DOC_FILENAME']);
} }
if (isset($outputDocumentData['OUT_DOC_TEMPLATE'])) {
$oOutputDocument->setOutDocTemplate($outputDocumentData['OUT_DOC_TEMPLATE']);
}
$oOutputDocument->save(); $oOutputDocument->save();
$oConnection->commit(); $oConnection->commit();
} else { } else {

5
workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
View File

@@ -128,6 +128,11 @@ class OutputDocumentStructure
*/ */
public $out_doc_filename; public $out_doc_filename;
/**
* @var string {@from body}
*/
public $out_doc_template;
/** /**
* @var string {@from body} {@choice TCPDF,HTML2PDF} * @var string {@from body} {@choice TCPDF,HTML2PDF}
*/ */