X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=resources%2FEditors%2FEditor.Roo.grid.Grid.js;h=6ca394d7bb6ed40fb1dbec51877e2e9ec719e0be;hb=42d9a93ede12d1906532ef54d18cb68f8a33e154;hp=f45ff6039d0576332847d6da59a31a190c7f45b5;hpb=e51f1085170a888b04fb84d559f73505a2dbab4e;p=app.Builder.js

diff --git a/resources/Editors/Editor.Roo.grid.Grid.js b/resources/Editors/Editor.Roo.grid.Grid.js
index f45ff6039..6ca394d7b 100644
--- a/resources/Editors/Editor.Roo.grid.Grid.js
+++ b/resources/Editors/Editor.Roo.grid.Grid.js
@@ -222,10 +222,33 @@ Editor.Roo.grid.Grid = new Roo.XComponent({
        this.table = "XXX";
        this.firstTxtCol = "XXX";
       
-      
+       
        var jreader = {};
+       var     colmodel = [];
+       this.grid.dataSource.each(function(rec) {
+           if (!rec.data.active) {
+               return;
+           }
+           
+           
+           
+           colmodel.push({
+               "xtype": "ColumnModel",
+               "header": rec.data.title,
+               "width":  rec.data.width * 1,
+               "dataIndex": rec.data.dataIndex,
+               "|renderer": !rec.data.type.match(/date/i) ? 
+                       "function(v) { return String.format('{0}', v); }" :
+                       "function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); }" , // special for date
+               "|xns": "Roo.grid",
+               "*prop": "colModel[]"
+           });
+       });
+       
+       
+       
    
-       JSON.stringify({
+       alert("IPC:OUT:" + JSON.stringify({
            '|xns' : 'Roo',
            xtype : "GridPanel",
            "title": this.table,
@@ -278,7 +301,14 @@ Editor.Roo.grid.Grid = new Roo.XComponent({
                                    "|url": "baseURL + '/Roo/" + this.table + ".php'",
                                    "|xns": "Roo.data"
                                },
-                               jreader
+                               {
+                                   '*prop' : 'reader',
+                                   'xtype' : 'JsonReader',
+                                   '|xns' : 'Roo.data',
+                                   'id' : 'id',
+                                   'root' : 'data',
+                                   'totalProperty' : 'total'
+                               }
                            ]
                        },
                        {
@@ -311,29 +341,7 @@ Editor.Roo.grid.Grid = new Roo.XComponent({
                                    },
                                    "|xns": "Roo.Toolbar"
                                },
-                               {
-                                   "text": "Edit",
-                                   "xtype": "Button",
-                                   "cls": "x-btn-text-icon",
-                                   "|icon": "Roo.rootURL + 'images/default/tree/leaf.gif'",
-                                   "listeners": {
-                                       "|click": "function()\n"+
-                                           "{\n"+
-                                           "    var s = _this.grid.getSelectionModel().getSelections();\n"+
-                                           "    if (!s.length || (s.length > 1))  {\n"+
-                                           "        Roo.MessageBox.alert(\"Error\", s.length ? \"Select only one Row\" : \"Select a Row\");\n"+
-                                           "        return;\n"+
-                                           "    }\n"+
-                                           "    if (!_this.dialog) return;\n" +
-                                           "    _this.dialog.show(s[0].data, function() {\n"+
-                                           "        _this.grid.footer.onClick('first');\n"+
-                                           "    }); \n"+
-                                           "    \n"+
-                                           "}\n" 
-                                       
-                                   },
-                                   "|xns": "Roo.Toolbar"
-                               },
+                                // fill ????
                                {
                                    "text": "Delete",
                                    "cls": "x-btn-text-icon",
@@ -342,7 +350,7 @@ Editor.Roo.grid.Grid = new Roo.XComponent({
                                    "listeners": {
                                        "|click": "function()\n"+
                                            "{\n"+
-                                           "     Pman.genericDelete(_this, '" + reader.table + "'); \n"+
+                                           "     Pman.genericDelete(_this, '" + this.table + "'); \n"+
                                            "}\n"+
                                            "        "
                                    },
@@ -350,12 +358,12 @@ Editor.Roo.grid.Grid = new Roo.XComponent({
                                }
                            ]
                        }, // end toolbar
-                   ].concat( reader.colmodel)
+                   ].concat( colmodel)
                }
            ]
            
            
-       }, null, 4)
+       }, null, 4));
    
    },
    xns : Roo,