From 5c99da4b2ff0b40e415091bf853ca3756bae8b48 Mon Sep 17 00:00:00 2001
From: Daniel Rojas <daniel.rojas@colosa.com>
Date: Tue, 29 Apr 2014 15:57:44 -0400
Subject: [PATCH] Se agregan y se modifican validaciones de los campos 
 out_doc_template, out_doc_current_revision, out_doc_field_mapping para
 OUTPUTDOCUMENTS

---
 .../BusinessModel/OutputDocument.php          | 19 ++++++++++++-------
 .../Services/Api/Project/OutputDocuments.php  |  5 -----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php b/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php
index 4a8981856..8e7b007b7 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/OutputDocument.php
@@ -83,7 +83,6 @@ 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'],
@@ -191,7 +190,6 @@ 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'],
@@ -261,6 +259,16 @@ class OutputDocument
                     $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);
             $aData = array_change_key_case($aData, CASE_LOWER);
             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'])) {
                         $oOutputDocument->setOutDocFilename($aData['OUT_DOC_FILENAME']);
                     }
-                    if (isset($aData['OUT_DOC_TEMPLATE'])) {
-                        $oOutputDocument->setOutDocTemplate($aData['OUT_DOC_TEMPLATE']);
-                    }
-                    $iResult = $oOutputDocument->save();
+                    $oOutputDocument->save();
                     $oConnection->commit();
                 } else {
                     $sMessage = '';
@@ -338,7 +343,7 @@ class OutputDocument
                 throw (new \Exception('This row does not exist!'));
             }
         } catch (\Exception $e) {
-                throw $e;
+            throw $e;
         }
     }
 
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php b/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
index 708fb8718..f55c911b4 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Project/OutputDocuments.php
@@ -128,11 +128,6 @@ class OutputDocumentStructure
      */
     public $out_doc_filename;
 
-    /**
-     * @var string {@from body}
-     */
-    public $out_doc_template;
-
     /**
      * @var string {@from body} {@choice TCPDF,HTML2PDF}
      */