Pman.Tab.AdminNotifyRecur.bjs

Pman.Tab.AdminNotifyRecur.js

diff --git a/Pman.Tab.AdminNotifyRecur.bjs b/Pman.Tab.AdminNotifyRecur.bjs
index 2cdc912..33f8afa 100644 (file)
--- a/Pman.Tab.AdminNotifyRecur.bjs
+++ b/Pman.Tab.AdminNotifyRecur.bjs
@@ -173,22 +173,13 @@
                             "*prop": "colModel[]"
                         },
                         {
-                            "xtype": "ColumnModel",
+                            "*prop": "colModel[]",
+                            "dataIndex": "onid",
                             "header": "Onid",
                             "width": 75,
-                            "dataIndex": "onid",
-                            "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
-                        },
-                        {
                             "xtype": "ColumnModel",
-                            "header": "Ontable",
-                            "width": 200,
-                            "dataIndex": "ontable",
-                            "|renderer": "function(v) { return String.format('{0}', v); }",
-                            "|xns": "Roo.grid",
-                            "*prop": "colModel[]"
+                            "|renderer": "function(v,x,r) { return String.format('{1}:{0}', v,r.data.ontable); }",
+                            "|xns": "Roo.grid"
                         },
                         {
                             "xtype": "ColumnModel",

diff --git a/Pman.Tab.AdminNotifyRecur.js b/Pman.Tab.AdminNotifyRecur.js
index 6d3d469..ff19260 100644 (file)
--- a/Pman.Tab.AdminNotifyRecur.js
+++ b/Pman.Tab.AdminNotifyRecur.js
@@ -274,18 +274,10 @@ Pman.Tab.AdminNotifyRecur = new Roo.XComponent({
                     {
                         xtype: 'ColumnModel',
                         xns: Roo.grid,
+                        dataIndex : 'onid',
                         header : 'Onid',
                         width : 75,
-                        dataIndex : 'onid',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Ontable',
-                        width : 200,
-                        dataIndex : 'ontable',
-                        renderer : function(v) { return String.format('{0}', v); }
+                        renderer : function(v,x,r) { return String.format('{1}:{0}', v,r.data.ontable); }
                     },
                     {
                         xtype: 'ColumnModel',