fernando/luos
1
0
Fork 0
Code Releases Activity

Se agregan y se modifican validaciones de los campos out_doc_template, out_doc_current_revision, out_doc_field_mapping para OUTPUTDOCUMENTS

Browse Source
This commit is contained in:
Daniel Rojas
2014-04-29 15:57:44 -04:00
parent df642423e3
commit 5c99da4b2f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,6 @@ 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'],
@@ -191,7 +190,6 @@ 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'],
@@ -261,6 +259,16 @@ class OutputDocument
$aData['OUT_DOC_PDF_SECURITY_PERMISSIONS'] = ""; $aData['OUT_DOC_PDF_SECURITY_PERMISSIONS'] = "";
} }
} }
if (isset($aData['OUT_DOC_CURRENT_REVISION'])) {
$oOutputDocument->setOutDocCurrentRevision($aData['OUT_DOC_CURRENT_REVISION']);
} else {
$oOutputDocument->setOutDocCurrentRevision(0);
}
if (isset($aData['OUT_DOC_FIELD_MAPPING'])) {
$oOutputDocument->setOutDocFieldMapping($aData['OUT_DOC_FIELD_MAPPING']);
} else {
$oOutputDocument->setOutDocFieldMapping(null);
}
$outDocUid = $oOutputDocument->create($aData); $outDocUid = $oOutputDocument->create($aData);
$aData = array_change_key_case($aData, CASE_LOWER); $aData = array_change_key_case($aData, CASE_LOWER);
if (isset( $aData['out_doc_pdf_security_open_password'] ) && $aData['out_doc_pdf_security_open_password'] != "") { if (isset( $aData['out_doc_pdf_security_open_password'] ) && $aData['out_doc_pdf_security_open_password'] != "") {
@@ -321,10 +329,7 @@ class OutputDocument
if (isset($aData['OUT_DOC_FILENAME'])) { if (isset($aData['OUT_DOC_FILENAME'])) {
$oOutputDocument->setOutDocFilename($aData['OUT_DOC_FILENAME']); $oOutputDocument->setOutDocFilename($aData['OUT_DOC_FILENAME']);
} }
if (isset($aData['OUT_DOC_TEMPLATE'])) { $oOutputDocument->save();
$oOutputDocument->setOutDocTemplate($aData['OUT_DOC_TEMPLATE']);
}
$iResult = $oOutputDocument->save();
$oConnection->commit(); $oConnection->commit();
} else { } else {
$sMessage = ''; $sMessage = '';

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

@@ -128,11 +128,6 @@ 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}
*/ */