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 c9cce40..c0254ef 100644 (file)
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -379,27 +379,22 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
          store : {
           '|xns' : 'Roo.data',
           data : [ 
-              [ 'ComboBox', "ComboBox"],
-              [ 'Text' , "TextField"],
-              [ 'Number', "NumberField"],
-              [ 'TextArea', "TextArea"],
-              [ 'Html', "HtmlEntry"]
-              
+              ['id']
           ],
-          fields : [  'ftype', 'fname'],
+          fields : [  'dfield'],
           xns : Roo.data,
           xtype : 'SimpleStore'
          },
          '|xns' : 'Roo.form',
          allowBlank : false,
-         displayField : 'fname',
+         displayField : 'dfield',
          editable : false,
          hiddenName : 'status',
          listWidth : 200,
          mode : 'local',
          name : 'display_field',
          triggerAction : 'all',
-         valueField : 'ftype',
+         valueField : 'dfield',
          width : 150,
          xns : Roo.form,
          xtype : 'ComboBox',
@@ -458,6 +453,17 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
       }
     ],
     listeners : {
+     beforeedit : function (e)
+      {
+          Roo.log('before edit!!!');
+          Roo.log(e);
+          
+          if(e.field != 'dfield'){
+              return false;
+          }
+          
+          _this.grid.colModel.getCellEditor(e.column, e.row).field.store.loadData(e.record.data.relates_to_schema);
+      },
      cellclick : function (_self, rowIndex, columnIndex, e)
       {
       
@@ -507,9 +513,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            var r = data[k];
            var has_s = typeof(r.relates_to_schema) != 'undefined';
            
-           var rt = '',
-           var rc = '',
-           var rs = [],
+           var rt = '', rc = '', rs = [];
            
            if(has_s){
                for (var kk in r.relates_to_schema) {         
@@ -538,19 +542,6 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            
            d.push(o);
            
-           /*
-           var d = [];
-           
-           for(var j = 0; j < fields.length; j++){
-               var f = fields.items[j];
-               
-               if(o.hasOwnProperty(f.name)){
-                   d.push(o[f.name]);
-               }
-           }
-           */
-           //ar.push(d);
-           
            if (!has_s) {
                continue;
            }
@@ -572,7 +563,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                d.push(o);
            }
        }
-       
+   
        var ar = [];
        
        Roo.each(d, function(dd){
@@ -583,7 +574,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                var f = fields.items[j];
                
                if(dd.hasOwnProperty(f.name)){
-                   a.push(o[f.name]);
+                   a.push(dd[f.name]);
                }
            }