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 ee1878b..d2629aa 100644 (file)
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -533,6 +533,38 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            var r = data[k];
            var has_s = typeof(r.relates_to_schema) != 'undefined';
            
+           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';
+                       }
+                   
+               }
+               
+           } esle {
+               switch r.Type {
+                   case 'text' :
+                       field_type = 'TextArea';
+                       break;
+                   case 'date' :
+                   case 'datetime':
+                       field_type = 'DateField';
+               }
+           
+           }
+           
            var rt = '', rc = '', rs = [];
            
            if(has_s){
@@ -545,8 +577,12 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                    rs.push([rr.Field]);
                    
                }
+               
+               field_type = 'ComboBox';
            }
            
+           
+           
            var o = {
                active : !has_s,
                dataIndex : r.Field,
@@ -562,26 +598,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            
            d.push(o);
            
-           if (!has_s) {
-               continue;
-           }
-           
-           for (var kk in r.relates_to_schema) {         
-               var rr = r.relates_to_schema[kk];
-               if (rr.Field == r.relates_to_col) {
-                   continue;
-               }
-               
-               var o = {
-                   active : false,
-                   dataIndex : r.Field + '_'+ rr.Field,
-                   type : r.Type,
-                   title : r.Field,
-                   width : 100
-               };
-               
-               d.push(o);
-           }
        }
    
        var ar = [];