fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in darojas/processmaker (pull request #491)

Browse Source 
Fix BUG 14907: No se visualiza los cambios en el editor tiny de OutputDocuments. SOLVED. Se modifica BEHAT outputDocuments
This commit is contained in:
Erik Amaru Ortiz
2014-05-16 08:34:52 -04:00
parent d18f8f4464 34798542e6
commit 114882e311
4 changed files with 51 additions and 40 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_description' => $aRow['OUT_DOC_DESCRIPTION'],
'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_landscape' => $aRow['OUT_DOC_LANDSCAPE'],
'out_doc_media' => $aRow['OUT_DOC_MEDIA'],
@@ -190,6 +191,7 @@ class OutputDocument
'out_doc_title' => $aRow['OUT_DOC_TITLE'],
'out_doc_description' => $aRow['OUT_DOC_DESCRIPTION'],
'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_landscape' => $aRow['OUT_DOC_LANDSCAPE'],
'out_doc_media' => $aRow['OUT_DOC_MEDIA'],
@@ -241,10 +243,7 @@ class OutputDocument
$outputDocumentData = array_change_key_case($outputDocumentData, CASE_UPPER);
$outputDocumentData['PRO_UID'] = $sProcessUID;
//Verify data
$process = new \Process();
if (!$process->exists($sProcessUID)) {
throw (new \Exception(str_replace(array("{0}", "{1}"), array($sProcessUID, "PROCESS"), "The UID \"{0}\" doesn't exist in table {1}")));
}
Validator::proUid($sProcessUID, '$pro_uid');
if ($outputDocumentData["OUT_DOC_TITLE"]=="") {
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'])) {
$oOutputDocument->setOutDocFilename($outputDocumentData['OUT_DOC_FILENAME']);
}
if (isset($outputDocumentData['OUT_DOC_TEMPLATE'])) {
$oOutputDocument->setOutDocTemplate($outputDocumentData['OUT_DOC_TEMPLATE']);
}
$oOutputDocument->save();
$oConnection->commit();
} else {