fernando/luos
1
0
Fork 0
Code Releases Activity

Fix bug 14245: Crear OutputDocuments en el nuevo Designer BPMN, cuando existe un OD con el mismo nombre en otro proceso

Browse Source
This commit is contained in:
Daniel Rojas
2014-08-28 10:18:44 -04:00
parent 00a2c82b83
commit 6e7eec7528
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,18 +392,26 @@ class OutputDocument
{ {
try { try {
$delimiter = \DBAdapter::getStringDelimiter(); $delimiter = \DBAdapter::getStringDelimiter();
$criteria = new \Criteria("workflow"); $criteria = new \Criteria("workflow");
$criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_UID); $criteria->addSelectColumn(\OutputDocumentPeer::OUT_DOC_UID);
$criteria->addAlias("CT", "CONTENT");
$criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array(); $arrayCondition = array();
$arrayCondition[] = array(\OutputDocumentPeer::OUT_DOC_UID, "CT.CON_ID", \Criteria::EQUAL); $arrayCondition[] = array(\OutputDocumentPeer::OUT_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "OUT_DOC_TITLE" . $delimiter, \Criteria::EQUAL); $arrayCondition[] = array("CT.CON_CATEGORY", $delimiter . "OUT_DOC_TITLE" . $delimiter, \Criteria::EQUAL);
$arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL); $arrayCondition[] = array("CT.CON_LANG", $delimiter . SYS_LANG . $delimiter, \Criteria::EQUAL);
$criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN); $criteria->addJoinMC($arrayCondition, \Criteria::LEFT_JOIN);
$criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL); $criteria->add(\OutputDocumentPeer::PRO_UID, $processUid, \Criteria::EQUAL);
$criteria->add(\ContentPeer::CON_VALUE, $title, \Criteria::EQUAL);
$criteria->add("CT.CON_VALUE", $title, \Criteria::EQUAL);
$rsCriteria = \OutputDocumentPeer::doSelectRS($criteria); $rsCriteria = \OutputDocumentPeer::doSelectRS($criteria);
$rsCriteria->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
if ($rsCriteria->next()) { if ($rsCriteria->next()) {
return true; return true;
} else { } else {