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 e7ee4ec..9c585a3 100644 (file)
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -40,7 +40,18 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
        
      
      ],
-     fields : [ 'active', 'dataIndex', 'type','title', 'width', 'ftype', 'display_field' ],
+     fields : [ 
+         'active', 
+         'dataIndex', 
+         'type',
+         'title', 
+         'width', 
+         'ftype', 
+         'display_field',
+         'relates_to_table',
+         'relates_to_col',
+         'relates_to_schema'
+     ],
      id : 'dataindex',
      xns : Roo.data,
      xtype : 'SimpleStore'
@@ -400,12 +411,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
         '|xns' : 'Roo.grid',
         xns : Roo.grid,
         xtype : 'GridEditor',
-        listeners : {
-         render : function (_self)
-          {
-              Roo.log('reader');
-          }
-        },
         items : [
 
         ]
@@ -493,11 +498,42 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
    
        //alert("IPC:TEST:" + JSON.stringify(data,null,4));
    
+       var fields = _this.grid.dataSource.reader.recordType.prototype.fields;
+       
        var ar = [];
        for (var k in data) { 
            var r = data[k];
-           var has_s = typeof(r.relates_to_schema) != 'undefined'
+           var has_s = typeof(r.relates_to_schema) != 'undefined';
            
+           var o = {
+               active : !has_s,
+               dataIndex : r.Field,
+               type : r.Type,
+               title : r.Field,
+               width : 100,
+               ftype : 'TextField',
+               display_field : r.Field + '_display_name',
+               relates_to_table : false,
+               relates_to_col : false,
+               relates_to_schema : []
+           };
+           
+           var d = [];
+           
+           for(var j = 0; j < fields.length; j++){
+               Roo.log(j);
+               Roo.log(fields);
+               Roo.log(fields.items[j]);
+               var f = fields.items[j];
+               Roo.log(f);
+               if(o.hasOwnProperty(f.name)){
+                   d.push(o[f.name]);
+               }
+           }
+           
+           ar.push(d);
+           
+           /*
            ar.push([ !has_s , r.Field, r.Type,  r.Field, 100 , 'TextField', r.Field + '_display_name'] );
            if (!has_s) {
                continue;
@@ -510,10 +546,10 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                }
                ar.push([ false, r.Field + '_'+ rr.Field, rr.Type,  rr.Field, 100] );
            }
-           
+           */
        }
+       
        Roo.log(ar);
-       Roo.log(_this.grid.dataSource.reader.readRecords(ar));
        this.schema = data;
        
        //alert("IPC:TEST:" + JSON.stringify(ar));