fernando/luos
1
0
Fork 0
Code Releases Activity

Se modifica validacion para de title en project OUTPUT DOCUMENTS

Browse Source
This commit is contained in:
Daniel Rojas
2014-03-28 10:13:26 -04:00
parent c164c42257
commit 7f0a527915
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/src/BusinessModel/OutputDocument.php
View File

@@ -267,7 +267,7 @@ class OutputDocument
$aData['out_doc_pdf_security_open_password'] = \G::encrypt( $aData['out_doc_pdf_security_open_password'], $outDocUid ); $aData['out_doc_pdf_security_open_password'] = \G::encrypt( $aData['out_doc_pdf_security_open_password'], $outDocUid );
$aData['out_doc_pdf_security_owner_password'] = \G::encrypt( $aData['out_doc_pdf_security_owner_password'], $outDocUid ); $aData['out_doc_pdf_security_owner_password'] = \G::encrypt( $aData['out_doc_pdf_security_owner_password'], $outDocUid );
} }
$this->updateOutputDocument($sProcessUID, $aData, $outDocUid); $this->updateOutputDocument($sProcessUID, $aData, $outDocUid, 1);
//Return //Return
unset($aData["PRO_UID"]); unset($aData["PRO_UID"]);
$aData = array_change_key_case($aData, CASE_LOWER); $aData = array_change_key_case($aData, CASE_LOWER);
@@ -283,10 +283,11 @@ class OutputDocument
* @param string $sProcessUID * @param string $sProcessUID
* @param array $aData * @param array $aData
* @param string $sOutputDocumentUID * @param string $sOutputDocumentUID
* @param int $sFlag
* *
* @access public * @access public
*/ */
public function updateOutputDocument($sProcessUID, $aData, $sOutputDocumentUID = '') public function updateOutputDocument($sProcessUID, $aData, $sOutputDocumentUID = '', $sFlag)
{ {
$oConnection = \Propel::getConnection(\OutputDocumentPeer::DATABASE_NAME); $oConnection = \Propel::getConnection(\OutputDocumentPeer::DATABASE_NAME);
$pemission = $aData['out_doc_pdf_security_permissions']; $pemission = $aData['out_doc_pdf_security_permissions'];
@@ -306,7 +307,7 @@ class OutputDocument
if ($oOutputDocument->validate()) { if ($oOutputDocument->validate()) {
$oConnection->begin(); $oConnection->begin();
if (isset($aData['OUT_DOC_TITLE'])) { if (isset($aData['OUT_DOC_TITLE'])) {
if ($this->existsTitle($sProcessUID, $aData["OUT_DOC_TITLE"])) { if ($this->existsTitle($sProcessUID, $aData["OUT_DOC_TITLE"]) && $sFlag == 0) {
throw (new \Exception(\G::LoadTranslation("ID_OUTPUT_NOT_SAVE"))); throw (new \Exception(\G::LoadTranslation("ID_OUTPUT_NOT_SAVE")));
} }
$oOutputDocument->setOutDocTitle($aData['OUT_DOC_TITLE']); $oOutputDocument->setOutDocTitle($aData['OUT_DOC_TITLE']);

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

@@ -86,7 +86,7 @@ class OutputDocuments extends Api
try { try {
$request_data = (array)($request_data); $request_data = (array)($request_data);
$outputDocument = new \BusinessModel\OutputDocument(); $outputDocument = new \BusinessModel\OutputDocument();
$arrayData = $outputDocument->updateOutputDocument($prjUid, $request_data, $outputDocumentUid); $arrayData = $outputDocument->updateOutputDocument($prjUid, $request_data, $outputDocumentUid, 0);
} catch (\Exception $e) { } catch (\Exception $e) {
//Response //Response
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());