Merged in dheeyi/processmaker/PM-3025 (pull request #2410)

Pm 3025

workflow/engine/classes/model/Dynaform.php

@@ -169,6 +169,7 @@ class Dynaform extends BaseDynaform
             $this->setProUid( $aData['PRO_UID'] );
             $this->setDynType( isset( $aData['DYN_TYPE'] ) ? $aData['DYN_TYPE'] : 'xmlform' );
             $this->setDynFilename( $aData['PRO_UID'] . PATH_SEP . $dynUid );
+            $this->setDynUpdateDate( date("Y-m-d H:i:s"));
 
             if (isset($aData["DYN_CONTENT"])) {
                 $this->setDynContent($aData["DYN_CONTENT"]);
@@ -569,6 +570,7 @@ class Dynaform extends BaseDynaform
             $oPro = DynaformPeer::retrieveByPK( $aData['DYN_UID'] );
             if (is_object( $oPro ) && get_class( $oPro ) == 'Dynaform') {
                 $oPro->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
+                $oPro->setDynUpdateDate(date("Y-m-d H:i:s"));
                 if ($oPro->validate()) {
                     if (isset( $aData['DYN_TITLE'] )) {
                         $oPro->setDynTitle( $aData['DYN_TITLE'] );

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

@@ -79,6 +79,8 @@ class DynaformMapBuilder
 
         $tMap->addColumn('DYN_VERSION', 'DynVersion', 'int', CreoleTypes::INTEGER, true, null);
 
+        $tMap->addColumn('DYN_UPDATE_DATE', 'DynUpdateDate', 'int', CreoleTypes::DATE, false, null);
+
         $tMap->addValidator('DYN_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'xmlform|grid', 'Please select a valid dynaform type.');
 
     } // doBuild()

workflow/engine/classes/model/om/BaseAbeConfigurationPeer.php

@@ -25,7 +25,7 @@ abstract class BaseAbeConfigurationPeer
     const CLASS_DEFAULT = 'classes.model.AbeConfiguration';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 12;
+    const NUM_COLUMNS = 13;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;

workflow/engine/classes/model/om/BaseAddonsManager.php

@@ -4,6 +4,7 @@ require_once 'propel/om/BaseObject.php';
 
 require_once 'propel/om/Persistent.php';
 
+
 include_once 'propel/util/Criteria.php';
 
 include_once 'classes/model/AddonsManagerPeer.php';
@@ -22,133 +23,114 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      * The Peer class.
      * Instance provides a convenient way of calling static methods on a class
      * that calling code may not be able to identify.
-     *
      * @var        AddonsManagerPeer
     */
     protected static $peer;
 
     /**
      * The value for the addon_id field.
-     *
      * @var        string
      */
     protected $addon_id;
 
     /**
      * The value for the store_id field.
-     *
      * @var        string
      */
     protected $store_id;
 
     /**
      * The value for the addon_name field.
-     *
      * @var        string
      */
     protected $addon_name;
 
     /**
      * The value for the addon_nick field.
-     *
      * @var        string
      */
     protected $addon_nick;
 
     /**
      * The value for the addon_download_filename field.
-     *
      * @var        string
      */
     protected $addon_download_filename;
 
     /**
      * The value for the addon_description field.
-     *
      * @var        string
      */
     protected $addon_description;
 
     /**
      * The value for the addon_state field.
-     *
      * @var        string
      */
     protected $addon_state;
 
     /**
      * The value for the addon_state_changed field.
-     *
      * @var        int
      */
     protected $addon_state_changed;
 
     /**
      * The value for the addon_status field.
-     *
      * @var        string
      */
     protected $addon_status;
 
     /**
      * The value for the addon_version field.
-     *
      * @var        string
      */
     protected $addon_version;
 
     /**
      * The value for the addon_type field.
-     *
      * @var        string
      */
     protected $addon_type;
 
     /**
      * The value for the addon_publisher field.
-     *
      * @var        string
      */
     protected $addon_publisher;
 
     /**
      * The value for the addon_release_date field.
-     *
      * @var        int
      */
     protected $addon_release_date;
 
     /**
      * The value for the addon_release_type field.
-     *
      * @var        string
      */
     protected $addon_release_type;
 
     /**
      * The value for the addon_release_notes field.
-     *
      * @var        string
      */
     protected $addon_release_notes;
 
     /**
      * The value for the addon_download_url field.
-     *
      * @var        string
      */
     protected $addon_download_url;
 
     /**
      * The value for the addon_download_progress field.
-     *
      * @var        double
      */
     protected $addon_download_progress;
 
     /**
      * The value for the addon_download_md5 field.
-     *
      * @var        string
      */
     protected $addon_download_md5;
@@ -156,7 +138,6 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
-     *
      * @var        boolean
      */
     protected $alreadyInSave = false;
@@ -164,7 +145,6 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
     /**
      * Flag to prevent endless validation loop, if this object is referenced
      * by another object which falls in this transaction.
-     *
      * @var        boolean
      */
     protected $alreadyInValidation = false;
@@ -176,6 +156,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonId()
     {
+
         return $this->addon_id;
     }
 
@@ -186,6 +167,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getStoreId()
     {
+
         return $this->store_id;
     }
 
@@ -196,6 +178,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonName()
     {
+
         return $this->addon_name;
     }
 
@@ -206,6 +189,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonNick()
     {
+
         return $this->addon_nick;
     }
 
@@ -216,6 +200,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonDownloadFilename()
     {
+
         return $this->addon_download_filename;
     }
 
@@ -226,6 +211,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonDescription()
     {
+
         return $this->addon_description;
     }
 
@@ -236,6 +222,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonState()
     {
+
         return $this->addon_state;
     }
 
@@ -249,14 +236,15 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonStateChanged($format = 'Y-m-d H:i:s')
     {
+
         if ($this->addon_state_changed === null || $this->addon_state_changed === '') {
             return null;
         } elseif (!is_int($this->addon_state_changed)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->addon_state_changed);
             if ($ts === -1 || $ts === false) {
-                // in PHP 5.1 return value changes to FALSE
+                throw new PropelException("Unable to parse value of [addon_state_changed] as date/time value: " .
-                throw new PropelException( "Unable to parse value of [addon_state_changed] as date/time value: " . var_export( $this->addon_state_changed, true ) );
+                    var_export($this->addon_state_changed, true));
             }
         } else {
             $ts = $this->addon_state_changed;
@@ -277,6 +265,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonStatus()
     {
+
         return $this->addon_status;
     }
 
@@ -287,6 +276,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonVersion()
     {
+
         return $this->addon_version;
     }
 
@@ -297,6 +287,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonType()
     {
+
         return $this->addon_type;
     }
 
@@ -307,6 +298,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonPublisher()
     {
+
         return $this->addon_publisher;
     }
 
@@ -320,14 +312,15 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonReleaseDate($format = 'Y-m-d H:i:s')
     {
+
         if ($this->addon_release_date === null || $this->addon_release_date === '') {
             return null;
         } elseif (!is_int($this->addon_release_date)) {
             // a non-timestamp value was set externally, so we convert it
             $ts = strtotime($this->addon_release_date);
             if ($ts === -1 || $ts === false) {
-                // in PHP 5.1 return value changes to FALSE
+                throw new PropelException("Unable to parse value of [addon_release_date] as date/time value: " .
-                throw new PropelException( "Unable to parse value of [addon_release_date] as date/time value: " . var_export( $this->addon_release_date, true ) );
+                    var_export($this->addon_release_date, true));
             }
         } else {
             $ts = $this->addon_release_date;
@@ -348,6 +341,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonReleaseType()
     {
+
         return $this->addon_release_type;
     }
 
@@ -358,6 +352,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonReleaseNotes()
     {
+
         return $this->addon_release_notes;
     }
 
@@ -368,6 +363,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonDownloadUrl()
     {
+
         return $this->addon_download_url;
     }
 
@@ -378,6 +374,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonDownloadProgress()
     {
+
         return $this->addon_download_progress;
     }
 
@@ -388,6 +385,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function getAddonDownloadMd5()
     {
+
         return $this->addon_download_md5;
     }
 
@@ -399,15 +397,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonId($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_id !== $v) {
             $this->addon_id = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_ID;
         }
+
     } // setAddonId()
 
     /**
@@ -418,15 +419,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setStoreId($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->store_id !== $v) {
             $this->store_id = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::STORE_ID;
         }
+
     } // setStoreId()
 
     /**
@@ -437,15 +441,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonName($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_name !== $v) {
             $this->addon_name = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_NAME;
         }
+
     } // setAddonName()
 
     /**
@@ -456,11 +463,13 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonNick($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_nick !== $v) {
             $this->addon_nick = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_NICK;
@@ -476,15 +485,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonDownloadFilename($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_download_filename !== $v) {
             $this->addon_download_filename = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_DOWNLOAD_FILENAME;
         }
+
     } // setAddonDownloadFilename()
 
     /**
@@ -495,15 +507,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonDescription($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_description !== $v) {
             $this->addon_description = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_DESCRIPTION;
         }
+
     } // setAddonDescription()
 
     /**
@@ -514,15 +529,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonState($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_state !== $v) {
             $this->addon_state = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_STATE;
         }
+
     } // setAddonState()
 
     /**
@@ -533,11 +551,16 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonStateChanged($v)
     {
+
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
+            //Date/time accepts null values
+            if ($v == '') {
+                $ts = null;
+            }
             if ($ts === -1 || $ts === false) {
-                // in PHP 5.1 return value changes to FALSE
+                throw new PropelException("Unable to parse date/time value for [addon_state_changed] from input: " .
-                throw new PropelException( "Unable to parse date/time value for [addon_state_changed] from input: " . var_export( $v, true ) );
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -546,6 +569,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
             $this->addon_state_changed = $ts;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_STATE_CHANGED;
         }
+
     } // setAddonStateChanged()
 
     /**
@@ -556,15 +580,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonStatus($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_status !== $v) {
             $this->addon_status = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_STATUS;
         }
+
     } // setAddonStatus()
 
     /**
@@ -575,15 +602,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonVersion($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_version !== $v) {
             $this->addon_version = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_VERSION;
         }
+
     } // setAddonVersion()
 
     /**
@@ -594,15 +624,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonType($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_type !== $v) {
             $this->addon_type = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_TYPE;
         }
+
     } // setAddonType()
 
     /**
@@ -613,15 +646,18 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonPublisher($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
             $v = (string) $v;
         }
+
         if ($this->addon_publisher !== $v) {
             $this->addon_publisher = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_PUBLISHER;
         }
+
     } // setAddonPublisher()
 
     /**
@@ -632,11 +668,16 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonReleaseDate($v)
     {
+
         if ($v !== null && !is_int($v)) {
             $ts = strtotime($v);
+            //Date/time accepts null values
+            if ($v == '') {
+                $ts = null;
+            }
             if ($ts === -1 || $ts === false) {
-                // in PHP 5.1 return value changes to FALSE
+                throw new PropelException("Unable to parse date/time value for [addon_release_date] from input: " .
-                throw new PropelException( "Unable to parse date/time value for [addon_release_date] from input: " . var_export( $v, true ) );
+                    var_export($v, true));
             }
         } else {
             $ts = $v;
@@ -645,6 +686,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
             $this->addon_release_date = $ts;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_RELEASE_DATE;
         }
+
     } // setAddonReleaseDate()
 
     /**
@@ -655,6 +697,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonReleaseType($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
@@ -676,6 +719,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonReleaseNotes($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
@@ -697,6 +741,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonDownloadUrl($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
@@ -707,6 +752,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
             $this->addon_download_url = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_DOWNLOAD_URL;
         }
+
     } // setAddonDownloadUrl()
 
     /**
@@ -717,10 +763,12 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonDownloadProgress($v)
     {
+
         if ($this->addon_download_progress !== $v) {
             $this->addon_download_progress = $v;
             $this->modifiedColumns[] = AddonsManagerPeer::ADDON_DOWNLOAD_PROGRESS;
         }
+
     } // setAddonDownloadProgress()
 
     /**
@@ -731,6 +779,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function setAddonDownloadMd5($v)
     {
+
         // Since the native PHP type for this column is string,
         // we will cast the input to a string (if it is not).
         if ($v !== null && !is_string($v)) {
@@ -840,13 +889,12 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
     }
 
     /**
-     * Stores the object in the database.
+     * Stores the object in the database.  If the object is new,
-     * If the object is new,
      * it inserts it; otherwise an update is performed.  This method
      * wraps the doSave() worker method in a transaction.
      *
      * @param      Connection $con
-     * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update
      * @throws     PropelException
      * @see        doSave()
      */
@@ -878,7 +926,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      * All related objects are also updated in this method.
      *
      * @param      Connection $con
-     * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+     * @return     int The number of rows affected by this insert/update and any referring
      * @throws     PropelException
      * @see        save()
      */
@@ -888,6 +936,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
         if (!$this->alreadyInSave) {
             $this->alreadyInSave = true;
 
+
             // If this object has been modified, then save it to the database.
             if ($this->isModified()) {
                 if ($this->isNew()) {
@@ -895,6 +944,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
                     $affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which
                                          // should always be true here (even though technically
                                          // BasePeer::doInsert() can insert multiple rows).
+
                     $this->setNew(false);
                 } else {
                     $affectedRows += AddonsManagerPeer::doUpdate($this, $con);
@@ -909,7 +959,6 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
 
     /**
      * Array of ValidationFailed objects.
-     *
      * @var        array ValidationFailed[]
      */
     protected $validationFailures = array();
@@ -957,7 +1006,8 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      * an aggreagated array of ValidationFailed objects will be returned.
      *
      * @param      array $columns Array of column names to validate.
-     * @return mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
+     * @return     mixed <code>true</code> if all validations pass; 
+                   array of <code>ValidationFailed</code> objects otherwise.
      */
     protected function doValidate($columns = null)
     {
@@ -967,10 +1017,13 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
 
             $failureMap = array();
 
+
             if (($retval = AddonsManagerPeer::doValidate($this, $columns)) !== true) {
                 $failureMap = array_merge($failureMap, $retval);
             }
 
+
+
             $this->alreadyInValidation = false;
         }
 
@@ -1093,7 +1146,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
             $keys[14] => $this->getAddonReleaseNotes(),
             $keys[15] => $this->getAddonDownloadUrl(),
             $keys[16] => $this->getAddonDownloadProgress(),
-            $keys[17] => $this->getAddonDownloadMd5()
+            $keys[17] => $this->getAddonDownloadMd5(),
         );
         return $result;
     }
@@ -1205,57 +1258,75 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
         if (array_key_exists($keys[0], $arr)) {
             $this->setAddonId($arr[$keys[0]]);
         }
+
         if (array_key_exists($keys[1], $arr)) {
             $this->setStoreId($arr[$keys[1]]);
         }
+
         if (array_key_exists($keys[2], $arr)) {
             $this->setAddonName($arr[$keys[2]]);
         }
+
         if (array_key_exists($keys[3], $arr)) {
             $this->setAddonNick($arr[$keys[3]]);
         }
+
         if (array_key_exists($keys[4], $arr)) {
             $this->setAddonDownloadFilename($arr[$keys[4]]);
         }
+
         if (array_key_exists($keys[5], $arr)) {
             $this->setAddonDescription($arr[$keys[5]]);
         }
+
         if (array_key_exists($keys[6], $arr)) {
             $this->setAddonState($arr[$keys[6]]);
         }
+
         if (array_key_exists($keys[7], $arr)) {
             $this->setAddonStateChanged($arr[$keys[7]]);
         }
+
         if (array_key_exists($keys[8], $arr)) {
             $this->setAddonStatus($arr[$keys[8]]);
         }
+
         if (array_key_exists($keys[9], $arr)) {
             $this->setAddonVersion($arr[$keys[9]]);
         }
+
         if (array_key_exists($keys[10], $arr)) {
             $this->setAddonType($arr[$keys[10]]);
         }
+
         if (array_key_exists($keys[11], $arr)) {
             $this->setAddonPublisher($arr[$keys[11]]);
         }
+
         if (array_key_exists($keys[12], $arr)) {
             $this->setAddonReleaseDate($arr[$keys[12]]);
         }
+
         if (array_key_exists($keys[13], $arr)) {
             $this->setAddonReleaseType($arr[$keys[13]]);
         }
+
         if (array_key_exists($keys[14], $arr)) {
             $this->setAddonReleaseNotes($arr[$keys[14]]);
         }
+
         if (array_key_exists($keys[15], $arr)) {
             $this->setAddonDownloadUrl($arr[$keys[15]]);
         }
+
         if (array_key_exists($keys[16], $arr)) {
             $this->setAddonDownloadProgress($arr[$keys[16]]);
         }
+
         if (array_key_exists($keys[17], $arr)) {
             $this->setAddonDownloadMd5($arr[$keys[17]]);
         }
+
     }
 
     /**
@@ -1270,58 +1341,76 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_ID)) {
             $criteria->add(AddonsManagerPeer::ADDON_ID, $this->addon_id);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::STORE_ID)) {
             $criteria->add(AddonsManagerPeer::STORE_ID, $this->store_id);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_NAME)) {
             $criteria->add(AddonsManagerPeer::ADDON_NAME, $this->addon_name);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_NICK)) {
             $criteria->add(AddonsManagerPeer::ADDON_NICK, $this->addon_nick);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_DOWNLOAD_FILENAME)) {
             $criteria->add(AddonsManagerPeer::ADDON_DOWNLOAD_FILENAME, $this->addon_download_filename);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_DESCRIPTION)) {
             $criteria->add(AddonsManagerPeer::ADDON_DESCRIPTION, $this->addon_description);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_STATE)) {
             $criteria->add(AddonsManagerPeer::ADDON_STATE, $this->addon_state);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_STATE_CHANGED)) {
             $criteria->add(AddonsManagerPeer::ADDON_STATE_CHANGED, $this->addon_state_changed);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_STATUS)) {
             $criteria->add(AddonsManagerPeer::ADDON_STATUS, $this->addon_status);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_VERSION)) {
             $criteria->add(AddonsManagerPeer::ADDON_VERSION, $this->addon_version);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_TYPE)) {
             $criteria->add(AddonsManagerPeer::ADDON_TYPE, $this->addon_type);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_PUBLISHER)) {
             $criteria->add(AddonsManagerPeer::ADDON_PUBLISHER, $this->addon_publisher);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_RELEASE_DATE)) {
             $criteria->add(AddonsManagerPeer::ADDON_RELEASE_DATE, $this->addon_release_date);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_RELEASE_TYPE)) {
             $criteria->add(AddonsManagerPeer::ADDON_RELEASE_TYPE, $this->addon_release_type);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_RELEASE_NOTES)) {
             $criteria->add(AddonsManagerPeer::ADDON_RELEASE_NOTES, $this->addon_release_notes);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_DOWNLOAD_URL)) {
             $criteria->add(AddonsManagerPeer::ADDON_DOWNLOAD_URL, $this->addon_download_url);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_DOWNLOAD_PROGRESS)) {
             $criteria->add(AddonsManagerPeer::ADDON_DOWNLOAD_PROGRESS, $this->addon_download_progress);
         }
+
         if ($this->isColumnModified(AddonsManagerPeer::ADDON_DOWNLOAD_MD5)) {
             $criteria->add(AddonsManagerPeer::ADDON_DOWNLOAD_MD5, $this->addon_download_md5);
         }
 
+
         return $criteria;
     }
 
@@ -1346,7 +1435,6 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
     /**
      * Returns the composite primary key for this object.
      * The array elements will be in same order as specified in XML.
-     *
      * @return     array
      */
     public function getPrimaryKey()
@@ -1387,6 +1475,7 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
      */
     public function copyInto($copyObj, $deepCopy = false)
     {
+
         $copyObj->setAddonName($this->addon_name);
 
         $copyObj->setAddonNick($this->addon_nick);
@@ -1419,11 +1508,12 @@ abstract class BaseAddonsManager extends BaseObject implements Persistent
 
         $copyObj->setAddonDownloadMd5($this->addon_download_md5);
 
+
         $copyObj->setNew(true);
 
-        $copyObj->setAddonId( null ); // this is a pkey column, so set to default value
+        $copyObj->setAddonId(NULL); // this is a pkey column, so set to default value
 
-        $copyObj->setStoreId( null ); // this is a pkey column, so set to default value
+        $copyObj->setStoreId(NULL); // this is a pkey column, so set to default value
 
     }
 

workflow/engine/classes/model/om/BaseDynaform.php

@@ -69,6 +69,12 @@ abstract class BaseDynaform extends BaseObject implements Persistent
      */
     protected $dyn_version;
 
+    /**
+     * The value for the dyn_update_date field.
+     * @var        int
+     */
+    protected $dyn_update_date;
+
     /**
      * Flag to prevent endless save loop, if this object is referenced
      * by another object which falls in this transaction.
@@ -160,6 +166,38 @@ abstract class BaseDynaform extends BaseObject implements Persistent
         return $this->dyn_version;
     }
 
+    /**
+     * Get the [optionally formatted] [dyn_update_date] column value.
+     * 
+     * @param      string $format The date/time format string (either date()-style or strftime()-style).
+     *                          If format is NULL, then the integer unix timestamp will be returned.
+     * @return     mixed Formatted date/time value as string or integer unix timestamp (if format is NULL).
+     * @throws     PropelException - if unable to convert the date/time to timestamp.
+     */
+    public function getDynUpdateDate($format = 'Y-m-d')
+    {
+
+        if ($this->dyn_update_date === null || $this->dyn_update_date === '') {
+            return null;
+        } elseif (!is_int($this->dyn_update_date)) {
+            // a non-timestamp value was set externally, so we convert it
+            $ts = strtotime($this->dyn_update_date);
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse value of [dyn_update_date] as date/time value: " .
+                    var_export($this->dyn_update_date, true));
+            }
+        } else {
+            $ts = $this->dyn_update_date;
+        }
+        if ($format === null) {
+            return $ts;
+        } elseif (strpos($format, '%') !== false) {
+            return strftime($format, $ts);
+        } else {
+            return date($format, $ts);
+        }
+    }
+
     /**
      * Set the value of [dyn_uid] column.
      * 
@@ -314,6 +352,35 @@ abstract class BaseDynaform extends BaseObject implements Persistent
 
     } // setDynVersion()
 
+    /**
+     * Set the value of [dyn_update_date] column.
+     * 
+     * @param      int $v new value
+     * @return     void
+     */
+    public function setDynUpdateDate($v)
+    {
+
+        if ($v !== null && !is_int($v)) {
+            $ts = strtotime($v);
+            //Date/time accepts null values
+            if ($v == '') {
+                $ts = null;
+            }
+            if ($ts === -1 || $ts === false) {
+                throw new PropelException("Unable to parse date/time value for [dyn_update_date] from input: " .
+                    var_export($v, true));
+            }
+        } else {
+            $ts = $v;
+        }
+        if ($this->dyn_update_date !== $ts) {
+            $this->dyn_update_date = $ts;
+            $this->modifiedColumns[] = DynaformPeer::DYN_UPDATE_DATE;
+        }
+
+    } // setDynUpdateDate()
+
     /**
      * Hydrates (populates) the object variables with values from the database resultset.
      *
@@ -345,12 +412,14 @@ abstract class BaseDynaform extends BaseObject implements Persistent
 
             $this->dyn_version = $rs->getInt($startcol + 6);
 
+            $this->dyn_update_date = $rs->getDate($startcol + 7, null);
+
             $this->resetModified();
 
             $this->setNew(false);
 
             // FIXME - using NUM_COLUMNS may be clearer.
-            return $startcol + 7; // 7 = DynaformPeer::NUM_COLUMNS - DynaformPeer::NUM_LAZY_LOAD_COLUMNS).
+            return $startcol + 8; // 8 = DynaformPeer::NUM_COLUMNS - DynaformPeer::NUM_LAZY_LOAD_COLUMNS).
 
         } catch (Exception $e) {
             throw new PropelException("Error populating Dynaform object", $e);
@@ -575,6 +644,9 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             case 6:
                 return $this->getDynVersion();
                 break;
+            case 7:
+                return $this->getDynUpdateDate();
+                break;
             default:
                 return null;
                 break;
@@ -602,6 +674,7 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             $keys[4] => $this->getDynContent(),
             $keys[5] => $this->getDynLabel(),
             $keys[6] => $this->getDynVersion(),
+            $keys[7] => $this->getDynUpdateDate(),
         );
         return $result;
     }
@@ -654,6 +727,9 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             case 6:
                 $this->setDynVersion($value);
                 break;
+            case 7:
+                $this->setDynUpdateDate($value);
+                break;
         } // switch()
     }
 
@@ -705,6 +781,10 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             $this->setDynVersion($arr[$keys[6]]);
         }
 
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setDynUpdateDate($arr[$keys[7]]);
+        }
+
     }
 
     /**
@@ -744,6 +824,10 @@ abstract class BaseDynaform extends BaseObject implements Persistent
             $criteria->add(DynaformPeer::DYN_VERSION, $this->dyn_version);
         }
 
+        if ($this->isColumnModified(DynaformPeer::DYN_UPDATE_DATE)) {
+            $criteria->add(DynaformPeer::DYN_UPDATE_DATE, $this->dyn_update_date);
+        }
+
 
         return $criteria;
     }
@@ -810,6 +894,8 @@ abstract class BaseDynaform extends BaseObject implements Persistent
 
         $copyObj->setDynVersion($this->dyn_version);
 
+        $copyObj->setDynUpdateDate($this->dyn_update_date);
+
 
         $copyObj->setNew(true);
 

workflow/engine/classes/model/om/BaseDynaformPeer.php

@@ -25,7 +25,7 @@ abstract class BaseDynaformPeer
     const CLASS_DEFAULT = 'classes.model.Dynaform';
 
     /** The total number of columns. */
-    const NUM_COLUMNS = 7;
+    const NUM_COLUMNS = 8;
 
     /** The number of lazy-loaded columns. */
     const NUM_LAZY_LOAD_COLUMNS = 0;
@@ -52,6 +52,9 @@ abstract class BaseDynaformPeer
     /** the column name for the DYN_VERSION field */
     const DYN_VERSION = 'DYNAFORM.DYN_VERSION';
 
+    /** the column name for the DYN_UPDATE_DATE field */
+    const DYN_UPDATE_DATE = 'DYNAFORM.DYN_UPDATE_DATE';
+
     /** The PHP to DB Name Mapping */
     private static $phpNameMap = null;
 
@@ -63,10 +66,10 @@ abstract class BaseDynaformPeer
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     private static $fieldNames = array (
-        BasePeer::TYPE_PHPNAME => array ('DynUid', 'ProUid', 'DynType', 'DynFilename', 'DynContent', 'DynLabel', 'DynVersion', ),
+        BasePeer::TYPE_PHPNAME => array ('DynUid', 'ProUid', 'DynType', 'DynFilename', 'DynContent', 'DynLabel', 'DynVersion', 'DynUpdateDate', ),
-        BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID, DynaformPeer::PRO_UID, DynaformPeer::DYN_TYPE, DynaformPeer::DYN_FILENAME, DynaformPeer::DYN_CONTENT, DynaformPeer::DYN_LABEL, DynaformPeer::DYN_VERSION, ),
+        BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID, DynaformPeer::PRO_UID, DynaformPeer::DYN_TYPE, DynaformPeer::DYN_FILENAME, DynaformPeer::DYN_CONTENT, DynaformPeer::DYN_LABEL, DynaformPeer::DYN_VERSION, DynaformPeer::DYN_UPDATE_DATE, ),
-        BasePeer::TYPE_FIELDNAME => array ('DYN_UID', 'PRO_UID', 'DYN_TYPE', 'DYN_FILENAME', 'DYN_CONTENT', 'DYN_LABEL', 'DYN_VERSION', ),
+        BasePeer::TYPE_FIELDNAME => array ('DYN_UID', 'PRO_UID', 'DYN_TYPE', 'DYN_FILENAME', 'DYN_CONTENT', 'DYN_LABEL', 'DYN_VERSION', 'DYN_UPDATE_DATE', ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -76,10 +79,10 @@ abstract class BaseDynaformPeer
      * e.g. self::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
      */
     private static $fieldKeys = array (
-        BasePeer::TYPE_PHPNAME => array ('DynUid' => 0, 'ProUid' => 1, 'DynType' => 2, 'DynFilename' => 3, 'DynContent' => 4, 'DynLabel' => 5, 'DynVersion' => 6, ),
+        BasePeer::TYPE_PHPNAME => array ('DynUid' => 0, 'ProUid' => 1, 'DynType' => 2, 'DynFilename' => 3, 'DynContent' => 4, 'DynLabel' => 5, 'DynVersion' => 6, 'DynUpdateDate' => 7, ),
-        BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID => 0, DynaformPeer::PRO_UID => 1, DynaformPeer::DYN_TYPE => 2, DynaformPeer::DYN_FILENAME => 3, DynaformPeer::DYN_CONTENT => 4, DynaformPeer::DYN_LABEL => 5, DynaformPeer::DYN_VERSION => 6, ),
+        BasePeer::TYPE_COLNAME => array (DynaformPeer::DYN_UID => 0, DynaformPeer::PRO_UID => 1, DynaformPeer::DYN_TYPE => 2, DynaformPeer::DYN_FILENAME => 3, DynaformPeer::DYN_CONTENT => 4, DynaformPeer::DYN_LABEL => 5, DynaformPeer::DYN_VERSION => 6, DynaformPeer::DYN_UPDATE_DATE => 7, ),
-        BasePeer::TYPE_FIELDNAME => array ('DYN_UID' => 0, 'PRO_UID' => 1, 'DYN_TYPE' => 2, 'DYN_FILENAME' => 3, 'DYN_CONTENT' => 4, 'DYN_LABEL' => 5, 'DYN_VERSION' => 6, ),
+        BasePeer::TYPE_FIELDNAME => array ('DYN_UID' => 0, 'PRO_UID' => 1, 'DYN_TYPE' => 2, 'DYN_FILENAME' => 3, 'DYN_CONTENT' => 4, 'DYN_LABEL' => 5, 'DYN_VERSION' => 6, 'DYN_UPDATE_DATE' => 7, ),
-        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, )
+        BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -194,6 +197,8 @@ abstract class BaseDynaformPeer
 
         $criteria->addSelectColumn(DynaformPeer::DYN_VERSION);
 
+        $criteria->addSelectColumn(DynaformPeer::DYN_UPDATE_DATE);
+
     }
 
     const COUNT = 'COUNT(DYNAFORM.DYN_UID)';

workflow/engine/config/schema.xml

@@ -465,6 +465,7 @@
     <column name="DYN_CONTENT" type="LONGVARCHAR"/>
     <column name="DYN_LABEL" type="LONGVARCHAR"/>
     <column name="DYN_VERSION" type="INTEGER" required="true"/>
+    <column name="DYN_UPDATE_DATE" type="DATE" required="false"/>
     <validator column="DYN_TYPE">
       <rule name="validValues" value="xmlform|grid" message="Please select a valid dynaform type."/>
     </validator>

workflow/engine/data/mssql/schema.sql

@@ -432,6 +432,7 @@ CREATE TABLE [DYNAFORM]
 	[PRO_UID] VARCHAR(32) default '0' NOT NULL,
 	[DYN_TYPE] VARCHAR(20) default 'xmlform' NOT NULL,
 	[DYN_FILENAME] VARCHAR(100) default '' NOT NULL,
+	[DYN_UPDATE_DATE] DATE default '' NOT NULL,
 	CONSTRAINT DYNAFORM_PK PRIMARY KEY ([DYN_UID])
 );
 

workflow/engine/src/ProcessMaker/BusinessModel/DynaForm.php

@@ -921,6 +921,7 @@ class DynaForm
             $criteria->addSelectColumn(\DynaformPeer::DYN_TYPE);
             $criteria->addSelectColumn(\DynaformPeer::DYN_CONTENT);
             $criteria->addSelectColumn(\DynaformPeer::DYN_VERSION);
+            $criteria->addSelectColumn(\DynaformPeer::DYN_UPDATE_DATE);
 
             $criteria->addAlias("CT", \ContentPeer::TABLE_NAME);
             $criteria->addAlias("CD", \ContentPeer::TABLE_NAME);
@@ -973,7 +974,8 @@ class DynaForm
                 $this->getFieldNameByFormatFieldName("DYN_DESCRIPTION") => $record["DYN_DESCRIPTION"] . "",
                 $this->getFieldNameByFormatFieldName("DYN_TYPE")        => $record["DYN_TYPE"] . "",
                 $this->getFieldNameByFormatFieldName("DYN_CONTENT")     => $record["DYN_CONTENT"] . "",
-                $this->getFieldNameByFormatFieldName("DYN_VERSION")     => (int)($record["DYN_VERSION"])
+                $this->getFieldNameByFormatFieldName("DYN_VERSION")     => (int)($record["DYN_VERSION"]),
+                $this->getFieldNameByFormatFieldName("DYN_UPDATE_DATE")     => $record["DYN_UPDATE_DATE"]
             );
         } catch (\Exception $e) {
             throw $e;