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 decba4f..06294f0 100644 (file)
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -381,20 +381,20 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
           data : [ 
               ['id']
           ],
-          fields : [  'ftype'],
+          fields : [  'dfield'],
           xns : Roo.data,
           xtype : 'SimpleStore'
          },
          '|xns' : 'Roo.form',
          allowBlank : false,
-         displayField : 'ftype',
+         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 +458,9 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
           Roo.log('before edit!!!');
           Roo.log(e);
           
+          if(e.field != 'display_field'){
+              return;
+          }
           
           _this.grid.colModel.getCellEditor(e.column, e.row).field.store.loadData(e.record.data.relates_to_schema);
       },
@@ -531,7 +534,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                title : r.Field,
                width : 100,
                ftype : 'TextField',
-               display_field : r.Field + '_display_name',
+               display_field : rc, //r.Field + '_display_name',
                relates_to_table : rt,
                relates_to_col : rc,
                relates_to_schema : rs
@@ -608,7 +611,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            var el = {
                fieldLabel : rec.data.title,
                name : rec.data.dataIndex,
-               width : 200, //row.type == 'string' ? 200 : 75,
+               width : r.data.width,
                '|xns' : 'Roo.form',
                xtype : rec.data.ftype
            }
@@ -629,12 +632,15 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            if (xtype == 'Combobox') {
            
    
-               el.queryParam  = 'query[' + combofields_name + ']';// SET WHEN USED
+               el.queryParam  = 'query[' + rec.data.display_field + ']';// SET WHEN USED
                
                el.hiddenName = rec.data.dataIndex // SET WHEN USED eg. project_id
-               el.displayField = combofields_name; // SET WHEN USED eg. project_id
-               el.name  = old.name + '_' + combofields_name; // SET WHEN USED eg. project_id_name
-               el.tpl = '<div class="x-grid-cell-text x-btn button"><b>{' + combofields_name +'}</b> </div>'; // SET WHEN USED
+               el.name  = rec.data.dataIndex + '_' + rec.data.display_field; // SET WHEN USED eg. project_id_name
+               
+               el.displayField = rec.data.display_field // SET WHEN USED eg. project_id
+               el.valueField = rec.data.relates_to_col 
+               
+               el.tpl = '<div class="x-grid-cell-text x-btn button"><b>{' + rec.data.display_field +'}</b> </div>'; // SET WHEN USED
              
            
               el.items = [
@@ -658,7 +664,7 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                                'xtype' : 'HttpProxy',
                                'method' : 'GET',
                                '|xns' : 'Roo.data',
-                               '|url' : "baseURL + '/Roo/" + reftable + ".php'",
+                               '|url' : "baseURL + '/Roo/" + rec.data.relates_to_table + ".php'",
                            },
                            
                            {
@@ -677,6 +683,21 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
            
            }
            
+           if (xtype == 'HtmlEditor') {
+               el.height = 100,
+               el.resizable = 's',
+               el.toolbar = [
+                   {
+                       '|xns' : 'Roo.form.HtmlEditor',
+                       'xtype' : 'ToolbarContext'
+                   },
+                   {
+                       '|xns' : 'Roo.form.HtmlEditor',
+                       'xtype' : 'ToolbarStandard'
+   
+                  }
+               ]
+           }
            
            formElements.push(el);