resources/Editors/Editor.Roo.LayoutDialog.bjs

[app.Builder.js] / resources / Editors / Editor.Roo.LayoutDialog.js

diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index 25ff494..9d84caf 100644 (file)
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -533,6 +533,31 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            var r = data[k];
            var has_s = typeof(r.relates_to_schema) != 'undefined';
            
+           Roo.log(r.Type);
+           var field_type = 'TextField';
+           
+           if (r.Type == 'text'){
+               field_type = 'TextArea';
+           }
+           
+           if(r.Type == 'date' || r.Type == 'datetime'){
+               field_type = 'DateField';
+           }
+               
+           var regex = /(.*?)\((.*?)\)/;
+           
+           if(regex.test(r.Type)){
+               var type_match = regex.exec(r.Type);
+               
+               if(type_match[1] == 'int'){
+                   field_type = 'NumberField';
+                       
+                   if(type_match[2] * 1  < 11){
+                       field_type = 'CheckBox';
+                   }
+               }
+           } 
+           
            var rt = '', rc = '', rs = [];
            
            if(has_s){
@@ -545,34 +570,13 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                    rs.push([rr.Field]);
                    
                }
-           }
-           
-           var field_type = 'TextField';
-           
-           var regex = /(.*?)\((.*?)\)/;
-           
-           if(regex.test(r.Type)){
-               var type_match = regex.exec(r.Type);
-               
-               switch type_match[1] {
-                   case 'varchar' :
-                       break;
-                   case 'int' :
-                       
-                       field_type = 'NumberField';
-                       
-                       if(type_match[2] * 1  < 11){
-                           field_type = 'CheckBox';
-                       }
-                   
-               }
                
+               field_type = 'ComboBox';
            }
            
-           var type_match = regex.exec(r.Type);
-           
-           Roo.log(type_match);
-           
+           if(r.Field == 'id'){ // usually 'id' is hidden on the form
+               field_type = 'Hidden';
+           }
            
            
            
@@ -582,7 +586,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                type : r.Type,
                title : r.Field,
                width : 200,
-               ftype : 'TextField',
+               ftype : field_type,
                display_field : rc, //r.Field + '_display_name',
                relates_to_table : rt,
                relates_to_col : rc,