X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2FEditors%2FEditor.Roo.LayoutDialog.js;h=d2629aa39d36fb056777692a8d795e7917446243;hb=1be141aa5ec3768dca510628250ba1603a7d5d10;hp=3a299f09220efd16981a8eef732853da573f5e9e;hpb=c1f67fb2a61eb63ce600421fa1a3bf9d5d0a6230;p=app.Builder.js

diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index 3a299f092..d2629aa39 100644
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -533,20 +533,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            var r = data[k];
            var has_s = typeof(r.relates_to_schema) != 'undefined';
            
-           var rt = '', rc = '', rs = [];
-           
-           if(has_s){
-               for (var kk in r.relates_to_schema) {         
-                   var rr = r.relates_to_schema[kk];
-                   
-                   rt = r.relates_to_table;
-                   rc = r.relates_to_col;
-                   
-                   rs.push([rr.Field]);
-                   
-               }
-           }
-           
            var field_type = 'TextField';
            
            var regex = /(.*?)\((.*?)\)/;
@@ -558,18 +544,42 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                    case 'varchar' :
                        break;
                    case 'int' :
+                       
+                       field_type = 'NumberField';
+                       
                        if(type_match[2] * 1  < 11){
                            field_type = 'CheckBox';
                        }
                    
                }
                
-           }
+           } esle {
+               switch r.Type {
+                   case 'text' :
+                       field_type = 'TextArea';
+                       break;
+                   case 'date' :
+                   case 'datetime':
+                       field_type = 'DateField';
+               }
            
-           var type_match = regex.exec(r.Type);
+           }
            
-           Roo.log(type_match);
+           var rt = '', rc = '', rs = [];
            
+           if(has_s){
+               for (var kk in r.relates_to_schema) {         
+                   var rr = r.relates_to_schema[kk];
+                   
+                   rt = r.relates_to_table;
+                   rc = r.relates_to_col;
+                   
+                   rs.push([rr.Field]);
+                   
+               }
+               
+               field_type = 'ComboBox';
+           }