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

Merged in qronald/processmaker/HOR-1511 (pull request #4621)

Browse Source 
HOR-1511
This commit is contained in:
Julio Cesar Laura Avendaño
2016-07-28 16:00:45 -04:00
parent 4e14ccc976 11a00a182b
commit 40b3cc19ae
5 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/map/TaskMapBuilder.php
View File

@@ -165,7 +165,7 @@ class TaskMapBuilder
$tMap->addColumn('TAS_SELFSERVICE_TIMEOUT', 'TasSelfserviceTimeout', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('TAS_SELFSERVICE_TIME', 'TasSelfserviceTime', 'string', CreoleTypes::VARCHAR, false, 15);
$tMap->addColumn('TAS_SELFSERVICE_TIME', 'TasSelfserviceTime', 'int', CreoleTypes::INTEGER, false, null);
$tMap->addColumn('TAS_SELFSERVICE_TIME_UNIT', 'TasSelfserviceTimeUnit', 'string', CreoleTypes::VARCHAR, false, 15);

20
workflow/engine/classes/model/om/BaseTask.php
View File

@@ -329,9 +329,9 @@ abstract class BaseTask extends BaseObject implements Persistent
/**
* The value for the tas_selfservice_time field.
* @var string
* @var int
*/
protected $tas_selfservice_time = '';
protected $tas_selfservice_time = 0;
/**
* The value for the tas_selfservice_time_unit field.
@@ -918,7 +918,7 @@ abstract class BaseTask extends BaseObject implements Persistent
/**
* Get the [tas_selfservice_time] column value.
*
* @return string
* @return int
*/
public function getTasSelfserviceTime()
{
@@ -2050,19 +2050,19 @@ abstract class BaseTask extends BaseObject implements Persistent
/**
* Set the value of [tas_selfservice_time] column.
*
* @param string $v new value
* @param int $v new value
* @return void
*/
public function setTasSelfserviceTime($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;
// Since the native PHP type for this column is integer,
// we will cast the input value to an int (if it is not).
if ($v !== null && !is_int($v) && is_numeric($v)) {
$v = (int) $v;
}
if ($this->tas_selfservice_time !== $v || $v === '') {
if ($this->tas_selfservice_time !== $v || $v === 0) {
$this->tas_selfservice_time = $v;
$this->modifiedColumns[] = TaskPeer::TAS_SELFSERVICE_TIME;
}
@@ -2252,7 +2252,7 @@ abstract class BaseTask extends BaseObject implements Persistent
$this->tas_selfservice_timeout = $rs->getInt($startcol + 49);
$this->tas_selfservice_time = $rs->getString($startcol + 50);
$this->tas_selfservice_time = $rs->getInt($startcol + 50);
$this->tas_selfservice_time_unit = $rs->getString($startcol + 51);