diff --git a/workflow/engine/classes/model/om/BaseCaseScheduler.php b/workflow/engine/classes/model/om/BaseCaseScheduler.php
index 95dac5c43..20440aa57 100644
--- a/workflow/engine/classes/model/om/BaseCaseScheduler.php
+++ b/workflow/engine/classes/model/om/BaseCaseScheduler.php
@@ -102,14 +102,14 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_last_state field.
* @var string
*/
- protected $sch_last_state;
+ protected $sch_last_state = '';
/**
* The value for the usr_uid field.
* @var string
*/
- protected $usr_uid;
+ protected $usr_uid = '';
/**
@@ -137,7 +137,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_days_perform_task field.
* @var string
*/
- protected $sch_days_perform_task;
+ protected $sch_days_perform_task = '';
/**
@@ -158,7 +158,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_start_day field.
* @var string
*/
- protected $sch_start_day;
+ protected $sch_start_day = '';
/**
@@ -179,14 +179,14 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
* The value for the sch_repeat_every field.
* @var string
*/
- protected $sch_repeat_every;
+ protected $sch_repeat_every = '';
/**
* The value for the sch_repeat_until field.
* @var string
*/
- protected $sch_repeat_until;
+ protected $sch_repeat_until = '';
/**
@@ -830,7 +830,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v;
}
- if ($this->sch_last_state !== $v) {
+ if ($this->sch_last_state !== $v || $v === '') {
$this->sch_last_state = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_LAST_STATE;
}
@@ -852,7 +852,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v;
}
- if ($this->usr_uid !== $v) {
+ if ($this->usr_uid !== $v || $v === '') {
$this->usr_uid = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::USR_UID;
}
@@ -944,7 +944,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v;
}
- if ($this->sch_days_perform_task !== $v) {
+ if ($this->sch_days_perform_task !== $v || $v === '') {
$this->sch_days_perform_task = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_DAYS_PERFORM_TASK;
}
@@ -1010,7 +1010,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v;
}
- if ($this->sch_start_day !== $v) {
+ if ($this->sch_start_day !== $v || $v === '') {
$this->sch_start_day = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_START_DAY;
}
@@ -1078,7 +1078,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v;
}
- if ($this->sch_repeat_every !== $v) {
+ if ($this->sch_repeat_every !== $v || $v === '') {
$this->sch_repeat_every = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_REPEAT_EVERY;
}
@@ -1100,7 +1100,7 @@ abstract class BaseCaseScheduler extends BaseObject implements Persistent {
$v = (string) $v;
}
- if ($this->sch_repeat_until !== $v) {
+ if ($this->sch_repeat_until !== $v || $v === '') {
$this->sch_repeat_until = $v;
$this->modifiedColumns[] = CaseSchedulerPeer::SCH_REPEAT_UNTIL;
}
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 3708a11d8..da1d2550a 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -2563,19 +2563,19 @@
-
-
+
+
-
+
-
+
-
-
+
+
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 1460c7d53..402ad5826 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -1239,19 +1239,19 @@ CREATE TABLE `CASE_SCHEDULER`
`SCH_TIME_NEXT_RUN` DATETIME NOT NULL,
`SCH_LAST_RUN_TIME` DATETIME,
`SCH_STATE` VARCHAR(15) default 'ACTIVE' NOT NULL,
- `SCH_LAST_STATE` VARCHAR(60) NOT NULL,
- `USR_UID` VARCHAR(32) NOT NULL,
+ `SCH_LAST_STATE` VARCHAR(60) default '' NOT NULL,
+ `USR_UID` VARCHAR(32) default '' NOT NULL,
`SCH_OPTION` TINYINT default 0 NOT NULL,
`SCH_START_TIME` DATETIME NOT NULL,
`SCH_START_DATE` DATETIME NOT NULL,
- `SCH_DAYS_PERFORM_TASK` CHAR(5) NOT NULL,
+ `SCH_DAYS_PERFORM_TASK` CHAR(5) default '' NOT NULL,
`SCH_EVERY_DAYS` TINYINT default 0,
`SCH_WEEK_DAYS` CHAR(14) default '0|0|0|0|0|0|0' NOT NULL,
- `SCH_START_DAY` CHAR(6) NOT NULL,
+ `SCH_START_DAY` CHAR(6) default '' NOT NULL,
`SCH_MONTHS` CHAR(24) default '0|0|0|0|0|0|0|0|0|0|0|0' NOT NULL,
`SCH_END_DATE` DATETIME,
- `SCH_REPEAT_EVERY` VARCHAR(15) NOT NULL,
- `SCH_REPEAT_UNTIL` VARCHAR(15) NOT NULL,
+ `SCH_REPEAT_EVERY` VARCHAR(15) default '' NOT NULL,
+ `SCH_REPEAT_UNTIL` VARCHAR(15) default '' NOT NULL,
`SCH_REPEAT_STOP_IF_RUNNING` TINYINT default 0,
`CASE_SH_PLUGIN_UID` VARCHAR(100),
PRIMARY KEY (`SCH_UID`)
diff --git a/workflow/engine/methods/cases/cases_Scheduler_Save.php b/workflow/engine/methods/cases/cases_Scheduler_Save.php
index 913eacafc..4be825646 100644
--- a/workflow/engine/methods/cases/cases_Scheduler_Save.php
+++ b/workflow/engine/methods/cases/cases_Scheduler_Save.php
@@ -82,7 +82,10 @@ try {
$sMonths = '';
$sStartDay = '';
$nSW = 0;
-
+ $aData['SCH_START_DAY'] = '';
+ $aData['SCH_REPEAT_EVERY'] = '';
+ $aData['SCH_REPEAT_UNTIL'] = '';
+ $aData['SCH_DAYS_PERFORM_TASK'] = '';
switch($sOption){
case '1' : // Option 1
$sValue = $_POST['form']['SCH_DAYS_PERFORM_TASK'];