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

Merged in darojas/processmaker/master-core (pull request #1233)

Browse Source 
PM-1040. Remove code from the Community version. Fix 14636 New Functionality - To allow set index in tables.
This commit is contained in:
Julio Cesar Laura Avendaño
2014-12-04 16:21:30 -04:00
parent 5d231c7874 710bf24578
commit 46fa17550d
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/templates/pmTables/edit.js
View File

@@ -160,14 +160,12 @@ Ext.onReady(function(){
hidden: true, hidden: true,
hideable:false hideable:false
}, },
/*----------------------------------********---------------------------------*/
{ {
id: 'field_index', id: 'field_index',
dataIndex: 'field_index', dataIndex: 'field_index',
hidden: true, hidden: true,
hideable:false hideable:false
}, },
/*----------------------------------********---------------------------------*/
{ {
id: 'field_null', id: 'field_null',
dataIndex: 'field_null', dataIndex: 'field_null',
@@ -306,7 +304,9 @@ Ext.onReady(function(){
disabled: true, disabled: true,
inputValue: 'always' inputValue: 'always'
} }
}, { }
/*----------------------------------********---------------------------------*/
, {
xtype: 'booleancolumn', xtype: 'booleancolumn',
header: _('ID_INDEX'), header: _('ID_INDEX'),
dataIndex: 'field_index', dataIndex: 'field_index',
@@ -320,7 +320,8 @@ Ext.onReady(function(){
disabled: true, disabled: true,
inputValue: 'always' inputValue: 'always'
} }
} }
/*----------------------------------********---------------------------------*/
]; ];
//if permissions plugin is enabled //if permissions plugin is enabled
@@ -1074,12 +1075,14 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldNull, fieldPrimaryKey, f
fieldPrimaryKey.setValue(false); fieldPrimaryKey.setValue(false);
} }
/*----------------------------------********---------------------------------*/
if (swI == 1) { if (swI == 1) {
fieldIndex.enable(); fieldIndex.enable();
} else { } else {
fieldIndex.disable(); fieldIndex.disable();
fieldIndex.setValue(false); fieldIndex.setValue(false);
} }
/*----------------------------------********---------------------------------*/
if (swAI == 1) { if (swAI == 1) {
fieldInc.enable(); fieldInc.enable();

9
workflow/engine/templates/pmTables/editReport.js
View File

@@ -408,7 +408,9 @@ Ext.onReady(function(){
disabled: true, disabled: true,
inputValue: 'always' inputValue: 'always'
} }
}, { }
/*----------------------------------********---------------------------------*/
, {
xtype: 'booleancolumn', xtype: 'booleancolumn',
header: _('ID_INDEX'), header: _('ID_INDEX'),
dataIndex: 'field_index', dataIndex: 'field_index',
@@ -423,6 +425,7 @@ Ext.onReady(function(){
inputValue: 'always' inputValue: 'always'
} }
} }
/*----------------------------------********---------------------------------*/
]; ];
function validateFieldSizeAutoincrement(valueType, defaultValue) { function validateFieldSizeAutoincrement(valueType, defaultValue) {
@@ -1300,14 +1303,14 @@ function editorFieldsEnableDisable(fieldTypeValue, fieldIndex, fieldInc, sizeEdi
swAI = 0; swAI = 0;
swI = 0; swI = 0;
} }
/*----------------------------------********---------------------------------*/
if (swI == 1) { if (swI == 1) {
fieldIndex.enable(); fieldIndex.enable();
} else { } else {
fieldIndex.disable(); fieldIndex.disable();
fieldIndex.setValue(false); fieldIndex.setValue(false);
} }
/*----------------------------------********---------------------------------*/
if (swAI == 1) { if (swAI == 1) {
fieldInc.enable(); fieldInc.enable();
} else { } else {