Merged in victorsl/processmaker (pull request #39)

ProcessMaker-MA "Fix in Step Triggers and InputDocuments (table CONTENT)"
This commit is contained in:
erik ao
2013-12-18 15:08:33 -04:00
2 changed files with 5 additions and 5 deletions

View File

@@ -49,7 +49,7 @@ class InputDocument
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_UID);
$criteria->addAlias("CT", "CONTENT"); $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$arrayCondition = array(); $arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL); $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);
@@ -266,8 +266,8 @@ class InputDocument
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESTINATION_PATH); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_DESTINATION_PATH);
$criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TAGS); $criteria->addSelectColumn(\InputDocumentPeer::INP_DOC_TAGS);
$criteria->addAlias("CT", "CONTENT"); $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", "CONTENT"); $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array(); $arrayCondition = array();
$arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL); $arrayCondition[] = array(\InputDocumentPeer::INP_DOC_UID, "CT.CON_ID", \Criteria::EQUAL);

View File

@@ -22,8 +22,8 @@ class Trigger
$criteria->addSelectColumn(\TriggersPeer::TRI_WEBBOT); $criteria->addSelectColumn(\TriggersPeer::TRI_WEBBOT);
$criteria->addSelectColumn(\TriggersPeer::TRI_PARAM); $criteria->addSelectColumn(\TriggersPeer::TRI_PARAM);
$criteria->addAlias("CT", "CONTENT"); $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
$criteria->addAlias("CD", "CONTENT"); $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
$arrayCondition = array(); $arrayCondition = array();
$arrayCondition[] = array(\TriggersPeer::TRI_UID, "CT.CON_ID", \Criteria::EQUAL); $arrayCondition[] = array(\TriggersPeer::TRI_UID, "CT.CON_ID", \Criteria::EQUAL);