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] 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 {