From bda6bd53283983707caeb730d25a88cac31c1003 Mon Sep 17 00:00:00 2001 From: jennylee Date: Thu, 4 Dec 2014 16:59:10 -0400 Subject: [PATCH] PM-1039 Arreglando files para community --- workflow/engine/classes/model/map/TaskMapBuilder.php | 4 ++-- workflow/engine/js/processmap/core/processes_Map.js | 2 -- workflow/engine/templates/cases/missRequiredFields.php | 4 ++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/model/map/TaskMapBuilder.php b/workflow/engine/classes/model/map/TaskMapBuilder.php index a3ed5c8a4..ef931fa2a 100755 --- a/workflow/engine/classes/model/map/TaskMapBuilder.php +++ b/workflow/engine/classes/model/map/TaskMapBuilder.php @@ -156,9 +156,9 @@ class TaskMapBuilder $tMap->addColumn('TAS_SELFSERVICE_TIME_UNIT', 'TasSelfserviceTimeUnit', 'string', CreoleTypes::VARCHAR, false, 15); $tMap->addColumn('TAS_SELFSERVICE_TRIGGER_UID', 'TasSelfserviceTriggerUid', 'string', CreoleTypes::VARCHAR, false, 32); - /*----------------------------------********---------------------------------*/ + $tMap->addColumn('TAS_SELFSERVICE_EXECUTION', 'TasSelfserviceExecution', 'string', CreoleTypes::VARCHAR, false, 15); - /*----------------------------------********---------------------------------*/ + $tMap->addValidator('TAS_TYPE', 'validValues', 'propel.validator.ValidValuesValidator', 'NORMAL|ADHOC|SUBPROCESS|HIDDEN', 'Please select a valid value for TAS_TYPE.'); $tMap->addValidator('TAS_TIMEUNIT', 'validValues', 'propel.validator.ValidValuesValidator', 'MINUTES|HOURS|DAYS|WEEKS|MONTHS', 'Please select a valid value for TAS_TIMEUNIT.'); diff --git a/workflow/engine/js/processmap/core/processes_Map.js b/workflow/engine/js/processmap/core/processes_Map.js index bbb6897ba..e45be59db 100755 --- a/workflow/engine/js/processmap/core/processes_Map.js +++ b/workflow/engine/js/processmap/core/processes_Map.js @@ -118,9 +118,7 @@ var saveDataTaskTemporal = function(iForm) oTaskData.TAS_SELFSERVICE_TIME = (sw == 1)? getField("TAS_SELFSERVICE_TIME").value : ""; oTaskData.TAS_SELFSERVICE_TIME_UNIT = (sw == 1)? getField("TAS_SELFSERVICE_TIME_UNIT").value : ""; oTaskData.TAS_SELFSERVICE_TRIGGER_UID = (sw == 1)? getField("TAS_SELFSERVICE_TRIGGER_UID").value : ""; - /*----------------------------------********---------------------------------*/ oTaskData.TAS_SELFSERVICE_EXECUTION = (sw == 1)? getField("TAS_SELFSERVICE_EXECUTION").value : ""; - /*----------------------------------********---------------------------------*/ break; case 3: case '3': diff --git a/workflow/engine/templates/cases/missRequiredFields.php b/workflow/engine/templates/cases/missRequiredFields.php index 908ccec4f..340b8b7d4 100755 --- a/workflow/engine/templates/cases/missRequiredFields.php +++ b/workflow/engine/templates/cases/missRequiredFields.php @@ -78,8 +78,12 @@ $html .= ''; $html .= ''; } else{ + /*----------------------------------********---------------------------------*/ + $html .= ''; $html .= ''; + + /*----------------------------------********---------------------------------*/ } /*----------------------------------********---------------------------------*/