X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2FEditors%2FEditor.Roo.LayoutDialog.js;h=2f10952179b383bedc6707b1902d047699115fbb;hb=e04aeb76772bc13427ba03fddafc34a962c3ddd6;hp=4c0b0b3ec3df06a53cffd616eed3ff0854dadc26;hpb=14541d2918dcf15524936e64f840bb4d0f06a77e;p=app.Builder.js

diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js
index 4c0b0b3ec..2f1095217 100644
--- a/resources/Editors/Editor.Roo.LayoutDialog.js
+++ b/resources/Editors/Editor.Roo.LayoutDialog.js
@@ -9,15 +9,16 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
  _strings : {
   'b021df6aac4654c454f46c77646e745f' :"Label",
   '793548e77e782c209a78ed67f255b5e2' :"Display Field",
+  '040076bde7f6b3387448e32b66c2eee0' :"To BJS",
   '4ce58cbe362a5d7b156992a496d55bf3' :"Database Column",
   '189efd19c4153526994a6d7ea5f6f068' :"Field Type",
   '2f616612593df62aeed112de4f03110e' :"Edit a Grid",
   '0ccc2bf3fb98387c23b6ca5500244d6e' :"Use ",
   'c671c787b49f50a3ace9fdc5bd597825' :"core_enum",
-  'dc30ec20708ef7b0f641ef78b7880a15' :"DEBUG",
   '32954654ac8fe66a1d09be19001de2d4' :"Width",
   'a1fa27779242b4902f7ae3bdd5c6d508' :"Type",
-  '6e7376dca68a2386a8737944196ab491' :"Create / Edit Grid"
+  '6e7376dca68a2386a8737944196ab491' :"Create / Edit Grid",
+  'f541774a08fc687f6e2016c77a6ebca5' :"Load Data"
  },
 
   part     :  ["Editors", "LayoutDialog" ],
@@ -74,13 +75,12 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
       },
       {
        '|xns' : 'Roo.Toolbar',
-       text : _this._strings['dc30ec20708ef7b0f641ef78b7880a15'],
+       text : _this._strings['f541774a08fc687f6e2016c77a6ebca5'],
        xns : Roo.Toolbar,
        xtype : 'Button',
        listeners : {
         click : function (_self, e)
          {
-             Roo.log(_this.ftype_combo);
              var data = {    
                  "manage_scale_id": {
                      "Field": "manage_scale_id",
@@ -240,9 +240,29 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({
                  }
              };
              
-             Roo.log('debuging...');
+             Roo.log('Loading Data...');
              _this.panel.loadData(data);
          
+         }
+       }
+      },
+      {
+       '|xns' : 'Roo.Toolbar',
+       xns : Roo.Toolbar,
+       xtype : 'Separator'
+      },
+      {
+       '|xns' : 'Roo.Toolbar',
+       text : _this._strings['040076bde7f6b3387448e32b66c2eee0'],
+       xns : Roo.Toolbar,
+       xtype : 'Button',
+       listeners : {
+        click : function (_self, e)
+         {
+             
+             Roo.log('Converting to BJS...');
+             _this.panel.toBJS();
+         
          }
        }
       }
@@ -381,20 +401,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 +478,10 @@ 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);
       },
      cellclick : function (_self, rowIndex, columnIndex, e)
@@ -530,7 +554,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
@@ -607,7 +631,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
            }
@@ -628,12 +652,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 = [
@@ -657,7 +684,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'",
                            },
                            
                            {
@@ -676,6 +703,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);