From 2ad7cd8d163fb1e3b6c81416ee39f5c5031eaaae Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Thu, 4 Dec 2014 11:36:35 -0400 Subject: [PATCH 1/3] Remove code from the Community version. Fix array code --- workflow/engine/templates/processes/main.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 9a2eb2c0b..3200297a2 100755 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -61,8 +61,9 @@ Ext.onReady(function(){ {name : 'CASES_COUNT_TO_DO', type:'float'}, {name : 'CASES_COUNT_COMPLETED', type:'float'}, {name : 'CASES_COUNT_CANCELLED', type:'float'}, - {name : 'PROJECT_TYPE', type:'string'}/*----------------------------------********---------------------------------*/, - {name : "PRO_TYPE_PROCESS", type: "string"} + {name : 'PROJECT_TYPE', type:'string'} + /*----------------------------------********---------------------------------*/ + ,{name : "PRO_TYPE_PROCESS", type: "string"} /*----------------------------------********---------------------------------*/ ] }), @@ -219,8 +220,9 @@ Ext.onReady(function(){ {header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 70, align:'right'}, {header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 70, align:'right'}, {header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 75,renderer:function(v){return ""+v+"";}, align:'right'}, - {header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'}/*----------------------------------********---------------------------------*/, - {header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"left"} + {header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 50, align:'center'} + /*----------------------------------********---------------------------------*/ + ,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"left"} /*----------------------------------********---------------------------------*/ ] }), From 710bf24578eb8e9b58c2c527deacb265d5394064 Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Thu, 4 Dec 2014 14:40:11 -0400 Subject: [PATCH 2/3] PM-1040. Remove code from the Community version. Fix 14636 New Functionality - To allow set index in tables. --- workflow/engine/templates/pmTables/edit.js | 11 +++++++---- workflow/engine/templates/pmTables/editReport.js | 9 ++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js index 44a0224e0..dd56fc60b 100644 --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -160,14 +160,12 @@ Ext.onReady(function(){ hidden: true, hideable:false }, - /*----------------------------------********---------------------------------*/ { id: 'field_index', dataIndex: 'field_index', hidden: true, hideable:false }, - /*----------------------------------********---------------------------------*/ { id: 'field_null', dataIndex: 'field_null', @@ -306,7 +304,9 @@ Ext.onReady(function(){ disabled: true, inputValue: 'always' } - }, { + } + /*----------------------------------********---------------------------------*/ + , { xtype: 'booleancolumn', header: _('ID_INDEX'), dataIndex: 'field_index', @@ -320,7 +320,8 @@ Ext.onReady(function(){ disabled: true, inputValue: 'always' } - } + } + /*----------------------------------********---------------------------------*/ ]; //if permissions plugin is enabled @@ -1074,12 +1075,14 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldNull, fieldPrimaryKey, f fieldPrimaryKey.setValue(false); } + /*----------------------------------********---------------------------------*/ if (swI == 1) { fieldIndex.enable(); } else { fieldIndex.disable(); fieldIndex.setValue(false); } + /*----------------------------------********---------------------------------*/ if (swAI == 1) { fieldInc.enable(); diff --git a/workflow/engine/templates/pmTables/editReport.js b/workflow/engine/templates/pmTables/editReport.js index 754a9a7fd..44b1f225f 100755 --- a/workflow/engine/templates/pmTables/editReport.js +++ b/workflow/engine/templates/pmTables/editReport.js @@ -408,7 +408,9 @@ Ext.onReady(function(){ disabled: true, inputValue: 'always' } - }, { + } + /*----------------------------------********---------------------------------*/ + , { xtype: 'booleancolumn', header: _('ID_INDEX'), dataIndex: 'field_index', @@ -423,6 +425,7 @@ Ext.onReady(function(){ inputValue: 'always' } } + /*----------------------------------********---------------------------------*/ ]; function validateFieldSizeAutoincrement(valueType, defaultValue) { @@ -1300,14 +1303,14 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldIndex, fieldInc, sizeEdi swAI = 0; swI = 0; } - +/*----------------------------------********---------------------------------*/ if (swI == 1) { fieldIndex.enable(); } else { fieldIndex.disable(); fieldIndex.setValue(false); } - +/*----------------------------------********---------------------------------*/ if (swAI == 1) { fieldInc.enable(); } else { From bda6bd53283983707caeb730d25a88cac31c1003 Mon Sep 17 00:00:00 2001 From: jennylee Date: Thu, 4 Dec 2014 16:59:10 -0400 Subject: [PATCH 3/3] 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 .= ''; + + /*----------------------------------********---------------------------------*/ } /*----------------------------------********---------------------------------*/