fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.0.1.6' into 3.0.1.6-Gmail

Browse Source
This commit is contained in:
Dante
2015-11-17 15:04:30 -04:00
parent 13369e943d a0cfee2611
commit 3eadfd7316
20 changed files with 212 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -40,10 +40,12 @@ function validateType ($value, $type)
$value1 = str_replace(".", "", $value1);
$value = $value1.".".$value2;
} else {
$value2 = substr($value, $posPoint+1);
$value1 = substr($value, 0, $posPoint);
$value1 = str_replace(",", "", $value1);
$value = $value1.".".$value2;
if($posPoint) {
$value2 = substr($value, $posPoint+1);
$value1 = substr($value, 0, $posPoint);
$value1 = str_replace(",", "", $value1);
$value = $value1.".".$value2;
}
}
break;
default:

4
workflow/engine/classes/model/Process.php
View File

@@ -173,13 +173,13 @@ class Process extends BaseProcess
$this->setProTimeunit( 'DAYS' );
$this->setProStatus( 'ACTIVE' );
$this->setProTypeDay( '' );
$this->setProType( 'NORMAL' );
$this->setProType((isset($aData["PRO_TYPE"]))? $aData["PRO_TYPE"]: "NORMAL");
$this->setProAssignment( 'FALSE' );
$this->setProShowMap( '' );
$this->setProShowMessage( '' );
$this->setProShowDelegate( '' );
$this->setProShowDynaform( '' );
$this->setProCategory( $aData['PRO_CATEGORY'] );
$this->setProCategory((isset($aData["PRO_CATEGORY"]))? $aData["PRO_CATEGORY"]: "");
$this->setProSubCategory( '' );
$this->setProIndustry( '' );
$this->setProCreateDate( date("Y-m-d H:i:s") );

6
workflow/engine/classes/model/map/ProcessMapBuilder.php
View File

@@ -77,7 +77,7 @@ class ProcessMapBuilder
$tMap->addColumn('PRO_TYPE_DAY', 'ProTypeDay', 'string', CreoleTypes::CHAR, true, 1);
$tMap->addColumn('PRO_TYPE', 'ProType', 'string', CreoleTypes::VARCHAR, true, 20);
$tMap->addColumn('PRO_TYPE', 'ProType', 'string', CreoleTypes::VARCHAR, true, 256);
$tMap->addColumn('PRO_ASSIGNMENT', 'ProAssignment', 'string', CreoleTypes::VARCHAR, true, 20);
@@ -87,6 +87,8 @@ class ProcessMapBuilder
$tMap->addColumn('PRO_SUBPROCESS', 'ProSubprocess', 'int', CreoleTypes::TINYINT, true, null);
$tMap->addColumn('PRO_TRI_OPEN', 'ProTriOpen', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TRI_DELETED', 'ProTriDeleted', 'string', CreoleTypes::VARCHAR, true, 32);
$tMap->addColumn('PRO_TRI_CANCELED', 'ProTriCanceled', 'string', CreoleTypes::VARCHAR, true, 32);
@@ -137,8 +139,6 @@ class ProcessMapBuilder
$tMap->addValidator('PRO_STATUS', 'validValues', 'propel.validator.ValidValuesValidator', 'ACTIVE|INACTIVE|DISABLED', 'Please select a valid Process Status.');
$tMap->addValidator('PRO_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL', 'Please select a valid Process Type.');
$tMap->addValidator('PRO_ASSIGNMENT', 'validValues', 'propel.validator.ValidValuesValidator', 'TRUE|FALSE', 'Please select a valid Process Assignment');
} // doBuild()

3
workflow/engine/classes/model/om/BaseProcessPeer.php
View File

@@ -670,9 +670,6 @@ abstract class BaseProcessPeer
if ($obj->isNew() || $obj->isColumnModified(ProcessPeer::PRO_STATUS))
$columns[ProcessPeer::PRO_STATUS] = $obj->getProStatus();
if ($obj->isNew() || $obj->isColumnModified(ProcessPeer::PRO_TYPE))
$columns[ProcessPeer::PRO_TYPE] = $obj->getProType();
if ($obj->isNew() || $obj->isColumnModified(ProcessPeer::PRO_ASSIGNMENT))
$columns[ProcessPeer::PRO_ASSIGNMENT] = $obj->getProAssignment();