Merge branch 'master' of bitbucket.org:colosa/processmaker

workflow/engine/classes/class.dbConnections.php

@@ -154,8 +154,9 @@ class dbConnections
         $result = DbSourcePeer::doSelectRS( $c );
         $result->next();
         $row = $result->getRow();
+        
         while ($row = $result->getRow()) {
-            if (trim( $pProUid ) == trim( $row[1] )) {
+            if ((trim( $pProUid ) == trim( $row[1] )) && ($row[2] == 'mysql')) {
                 $connections[] = Array ('DBS_UID' => $row[0],'DBS_NAME' => '[' . $row[3] . '] ' . $row[2] . ': ' . $row[4]
                 );
             }

workflow/engine/classes/model/Dynaform.php

@@ -517,13 +517,14 @@ class Dynaform extends BaseDynaform
         return $G_FORM->fields;
     }
 
-    public function verifyExistingName ($sName, $sProUid)
+    public function verifyExistingName ($sName, $sProUid, $sDynUid)
     {
         $sNameDyanform = urldecode( $sName );
         $sProUid = urldecode( $sProUid );
         $oCriteria = new Criteria( 'workflow' );
         $oCriteria->addSelectColumn( DynaformPeer::DYN_UID );
         $oCriteria->add( DynaformPeer::PRO_UID, $sProUid );
+        $oCriteria->add( DynaformPeer::DYN_UID, $sDynUid );
         $oDataset = DynaformPeer::doSelectRS( $oCriteria );
         $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC );
         $flag = true;
@@ -532,14 +533,16 @@ class Dynaform extends BaseDynaform
             $oCriteria1 = new Criteria( 'workflow' );
             $oCriteria1->addSelectColumn( 'COUNT(*) AS DYNAFORMS' );
             $oCriteria1->add( ContentPeer::CON_CATEGORY, 'DYN_TITLE' );
-            $oCriteria1->add( ContentPeer::CON_ID, $aRow['DYN_UID'] );
+            $oCriteria1->add( ContentPeer::CON_ID, $sDynUid, Criteria::NOT_EQUAL);
             $oCriteria1->add( ContentPeer::CON_VALUE, $sNameDyanform );
             $oCriteria1->add( ContentPeer::CON_LANG, SYS_LANG );
+            $oCriteria1->add( DynaformPeer::PRO_UID, $sProUid);
+            $oCriteria1->addJoin( ContentPeer::CON_ID, DynaformPeer::DYN_UID, Criteria::INNER_JOIN );
             $oDataset1 = ContentPeer::doSelectRS( $oCriteria1 );
             $oDataset1->setFetchmode( ResultSet::FETCHMODE_ASSOC );
             $oDataset1->next();
             $aRow1 = $oDataset1->getRow();
-            if ($aRow1['DYNAFORMS']) {
+            if ($aRow1['DYNAFORMS'] == 1) {
                 $flag = false;
                 break;
             }

workflow/engine/classes/model/Message.php

@@ -0,0 +1,19 @@
+<?php
+
+require_once 'classes/model/om/BaseMessage.php';
+
+
+/**
+ * Skeleton subclass for representing a row from the 'MESSAGE' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class Message extends BaseMessage {
+
+} // Message

workflow/engine/classes/model/MessageDetail.php

@@ -0,0 +1,19 @@
+<?php
+
+require_once 'classes/model/om/BaseMessageDetail.php';
+
+
+/**
+ * Skeleton subclass for representing a row from the 'MESSAGE_DETAIL' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class MessageDetail extends BaseMessageDetail {
+
+} // MessageDetail

workflow/engine/classes/model/MessageDetailPeer.php

@@ -0,0 +1,23 @@
+<?php
+
+  // include base peer class
+  require_once 'classes/model/om/BaseMessageDetailPeer.php';
+
+  // include object class
+  include_once 'classes/model/MessageDetail.php';
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'MESSAGE_DETAIL' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class MessageDetailPeer extends BaseMessageDetailPeer {
+
+} // MessageDetailPeer

workflow/engine/classes/model/MessagePeer.php

@@ -0,0 +1,23 @@
+<?php
+
+  // include base peer class
+  require_once 'classes/model/om/BaseMessagePeer.php';
+
+  // include object class
+  include_once 'classes/model/Message.php';
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'MESSAGE' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    classes.model
+ */
+class MessagePeer extends BaseMessagePeer {
+
+} // MessagePeer

workflow/engine/classes/model/map/MessageDetailMapBuilder.php

@@ -0,0 +1,78 @@
+<?php
+
+require_once 'propel/map/MapBuilder.php';
+include_once 'creole/CreoleTypes.php';
+
+
+/**
+ * This class adds structure of 'MESSAGE_DETAIL' table to 'workflow' DatabaseMap object.
+ *
+ *
+ *
+ * These statically-built map classes are used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package    workflow.classes.model.map
+ */
+class MessageDetailMapBuilder
+{
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'classes.model.map.MessageDetailMapBuilder';
+
+    /**
+     * The database map.
+     */
+    private $dbMap;
+
+    /**
+     * Tells us if this DatabaseMapBuilder is built so that we
+     * don't have to re-build it every time.
+     *
+     * @return     boolean true if this DatabaseMapBuilder is built, false otherwise.
+     */
+    public function isBuilt()
+    {
+        return ($this->dbMap !== null);
+    }
+
+    /**
+     * Gets the databasemap this map builder built.
+     *
+     * @return     the databasemap
+     */
+    public function getDatabaseMap()
+    {
+        return $this->dbMap;
+    }
+
+    /**
+     * The doBuild() method builds the DatabaseMap
+     *
+     * @return     void
+     * @throws     PropelException
+     */
+    public function doBuild()
+    {
+        $this->dbMap = Propel::getDatabaseMap('workflow');
+
+        $tMap = $this->dbMap->addTable('MESSAGE_DETAIL');
+        $tMap->setPhpName('MessageDetail');
+
+        $tMap->setUseIdGenerator(false);
+
+        $tMap->addPrimaryKey('MD_UID', 'MdUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('MES_UID', 'MesUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('MD_TYPE', 'MdType', 'string', CreoleTypes::VARCHAR, false, 32);
+
+        $tMap->addColumn('MD_NAME', 'MdName', 'string', CreoleTypes::VARCHAR, false, 255);
+
+    } // doBuild()
+
+} // MessageDetailMapBuilder

workflow/engine/classes/model/map/MessageMapBuilder.php

@@ -0,0 +1,78 @@
+<?php
+
+require_once 'propel/map/MapBuilder.php';
+include_once 'creole/CreoleTypes.php';
+
+
+/**
+ * This class adds structure of 'MESSAGE' table to 'workflow' DatabaseMap object.
+ *
+ *
+ *
+ * These statically-built map classes are used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package    workflow.classes.model.map
+ */
+class MessageMapBuilder
+{
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'classes.model.map.MessageMapBuilder';
+
+    /**
+     * The database map.
+     */
+    private $dbMap;
+
+    /**
+     * Tells us if this DatabaseMapBuilder is built so that we
+     * don't have to re-build it every time.
+     *
+     * @return     boolean true if this DatabaseMapBuilder is built, false otherwise.
+     */
+    public function isBuilt()
+    {
+        return ($this->dbMap !== null);
+    }
+
+    /**
+     * Gets the databasemap this map builder built.
+     *
+     * @return     the databasemap
+     */
+    public function getDatabaseMap()
+    {
+        return $this->dbMap;
+    }
+
+    /**
+     * The doBuild() method builds the DatabaseMap
+     *
+     * @return     void
+     * @throws     PropelException
+     */
+    public function doBuild()
+    {
+        $this->dbMap = Propel::getDatabaseMap('workflow');
+
+        $tMap = $this->dbMap->addTable('MESSAGE');
+        $tMap->setPhpName('Message');
+
+        $tMap->setUseIdGenerator(false);
+
+        $tMap->addPrimaryKey('MES_UID', 'MesUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('PRJ_UID', 'PrjUid', 'string', CreoleTypes::VARCHAR, true, 32);
+
+        $tMap->addColumn('MES_NAME', 'MesName', 'string', CreoleTypes::VARCHAR, false, 255);
+
+        $tMap->addColumn('MES_CONDITION', 'MesCondition', 'string', CreoleTypes::VARCHAR, false, 255);
+
+    } // doBuild()
+
+} // MessageMapBuilder