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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-11603

Browse Source
This commit is contained in:
Luis Fernando Saisa Lopez
2013-06-24 15:23:27 +00:00
parent b1d0dd6078 5e4c392b08
commit 6ee0d083be
2 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/js/events/events.js
View File

@@ -9,7 +9,7 @@ var eventsNewAction = function(oForm) {
return false; return false;
} }
if (oForm.onsubmit()) { if (oForm) {
oRPC = new leimnud.module.rpc.xmlhttp({ oRPC = new leimnud.module.rpc.xmlhttp({
url : '../events/eventsNewAction', url : '../events/eventsNewAction',
method: 'POST', method: 'POST',
@@ -164,7 +164,7 @@ var EventCompose = function(t){
// previous calls for the old component // previous calls for the old component
// url : '../events/eventsAjax', // url : '../events/eventsAjax',
// args: 'request=showDynavars', // args: 'request=showDynavars',
// the control for assign dynavars is the same as // the control for assign dynavars is the same as
// the other sections inside processmaker // the other sections inside processmaker
url : '../controls/varsAjax', url : '../controls/varsAjax',
args: 'sSymbol=@@&displayOption=event' args: 'sSymbol=@@&displayOption=event'

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

@@ -119,20 +119,20 @@ Ext.onReady(function(){
} }
} }
}); });
var sizeField = new fm.NumberField({ var sizeField = new fm.NumberField({
name: 'sizeEdit', name: 'sizeEdit',
id: 'sizeEdit', id: 'sizeEdit',
allowBlank: true, allowBlank: true,
allowDecimals: false, allowDecimals: false,
allowNegative: false, allowNegative: false,
disabled: true, disabled: true,
nanText: 'This field should content a number', nanText: 'This field should content a number',
minValue: 1, minValue: 1,
maxValue: 99, maxValue: 99,
minLength: 0 minLength: 0
}); });
//check column for tablesizeField columns grid //check column for tablesizeField columns grid
var checkColumn = new Ext.grid.CheckColumn({ var checkColumn = new Ext.grid.CheckColumn({
header: 'Filter', header: 'Filter',
@@ -197,7 +197,7 @@ Ext.onReady(function(){
width: 75, width: 75,
editor: new fm.ComboBox({ editor: new fm.ComboBox({
typeAhead: true, typeAhead: true,
editable:true, editable: false,
lazyRender: true, lazyRender: true,
mode: 'local', mode: 'local',
displayField:'type', displayField:'type',
@@ -217,42 +217,77 @@ Ext.onReady(function(){
Ext.getCmp('sizeEdit').setValue(''); Ext.getCmp('sizeEdit').setValue('');
} }
selCombo = combo.getValue(); selCombo = combo.getValue();
if(selCombo != 'DOUBLE'
&& selCombo != 'TIME' var swSize = 1; //Enable
&& selCombo != 'DATE' var swNull = 1;
&& selCombo != 'DATETIME' var swPK = 1;
&& selCombo != 'BOOLEAN' var swAI = 1;
&& selCombo != 'REAL'
&& selCombo != 'FLOAT') { //Date
Ext.getCmp('sizeEdit').enable(); if (selCombo == "DATE" || selCombo == "DATETIME" || selCombo == "TIME") {
} else { swSize = 0; //Disable
Ext.getCmp('sizeEdit').disable(); swPK = 0;
swAI = 0;
} }
if(selCombo == 'CHAR' || selCombo == 'VARCHAR') {
Ext.getCmp('sizeEdit').setMaxValue(((selCombo == 'CHAR')?255:999)); //Numbers
sizeField.getEl().dom.maxLength = 3; if (selCombo == "INTEGER" || selCombo == "BIGINT" || selCombo == "TINYINT" || selCombo == "SMALLINT") {
Ext.getCmp('field_null').enable(); //Enable All
Ext.getCmp('field_null').setValue(true);
} else {
Ext.getCmp('sizeEdit').setMaxValue(99);
sizeField.getEl().dom.maxLength = 2;
Ext.getCmp('field_null').disable();
Ext.getCmp('field_null').setValue(false);
} }
if( selCombo == 'CHAR'
|| selCombo == 'VARCHAR' if (selCombo == "DECIMAL" || selCombo == "DOUBLE" || selCombo == "FLOAT" || selCombo == "REAL") {
|| selCombo == 'TIME' swPK = 0;
|| selCombo == 'DATE' swAI = 0;
|| selCombo == 'DATETIME' }
|| selCombo == 'BOOLEAN'
|| selCombo == 'REAL' //String
|| selCombo == 'FLOAT' if (selCombo == "CHAR" || selCombo == "VARCHAR" || selCombo == "LONGVARCHAR") {
|| selCombo == 'DOUBLE') { swAI = 0;
Ext.getCmp('field_primary_key').disable(); }
Ext.getCmp('field_incre').disable();
//Boolean
if (selCombo == "BOOLEAN") {
swSize = 0;
swNull = 0;
swPK = 0;
swAI = 0;
}
if (swNull == 1) {
Ext.getCmp("field_null").enable();
} else { } else {
Ext.getCmp('field_primary_key').enable(); Ext.getCmp("field_null").disable();
Ext.getCmp('field_incre').enable(); Ext.getCmp("field_null").setValue(false);
}
if (swPK == 1) {
Ext.getCmp("field_primary_key").enable();
} else {
Ext.getCmp("field_primary_key").disable();
Ext.getCmp("field_primary_key").setValue(false);
}
if (swAI == 1) {
Ext.getCmp("field_incre").enable();
} else {
Ext.getCmp("field_incre").disable();
Ext.getCmp("field_incre").setValue(false);
}
if (swSize == 1) {
Ext.getCmp("sizeEdit").enable();
if (selCombo == "CHAR" || selCombo == "VARCHAR" || selCombo == "LONGVARCHAR") {
Ext.getCmp("sizeEdit").setMaxValue(((selCombo == "CHAR") ? 255 : 999));
sizeField.getEl().dom.maxLength = 3;
} else {
Ext.getCmp("sizeEdit").setMaxValue(99);
sizeField.getEl().dom.maxLength = 2;
}
} else {
Ext.getCmp("sizeEdit").disable();
Ext.getCmp("sizeEdit").setValue("");
} }
} }
}//select }//select