Pman.Tab.AdminLogDrill.bjs

Pman.Tab.AdminLogDrill.bjs
Pman.Tab.AdminLogDrill.js
Pman.Tab.AdminLogDrill.js

diff --git a/Pman.Tab.AdminLogDrill.bjs b/Pman.Tab.AdminLogDrill.bjs
index 629eec8..fb05516 100644 (file)
--- a/Pman.Tab.AdminLogDrill.bjs
+++ b/Pman.Tab.AdminLogDrill.bjs
@@ -182,7 +182,7 @@
                                     "items": [
                                         {
                                             "listeners": {
-                                                "beforeload": "function (_self, o)\n{\n     if (! _this.dategrid) {\n     return;\n    }\n    if (_this.detailgrid) {\n        _this.detailgrid.ds.removeAll();\n    }\n    \n    var s = _this.dategrid.selModel.getSelected();\n    if (!s) {\n        _this.tablegrid.view.el.mask(\"Select a person\");\n        return false;\n    }\n    _this.tablegrid.view.el.unmask();\n \n    o.params = o.params || {};\n    var act = _this.actionSel.getValue();\n    if (act.length) {\n        o.params.action = act;\n    }\n    var tbl = _this.affectSel.getValue();\n    if (tbl.length) {\n        o.params.on_table = tbl;\n    }\n \n    act = _this.dateFrom.getValue();\n    if (act.format) {\n        o.params['query[from]'] = act.format('Y-m-d');\n    }\n    act = _this.dateTo.getValue();\n    if (act.format) {\n        o.params['query[to]'] = act.format('Y-m-d');\n    }\n    o.params.person_id = s.data.person_id;\n    o.params['query[table_sum]'] = 1;\n    o.params._columns = 'on_table,qty,uqty';\n\n    \n}"
+                                                "beforeload": "function (_self, o)\n{\n     if (! _this.dategrid) {\n     return;\n    }\n    try {\n         _this.panel.layout.getRegion('east').getActivePanel().grid.ds.removeAll();\n         \n    } catch (e) {\n        // do nothing..\n    }\n    \n    var s = _this.dategrid.selModel.getSelected();\n    if (!s) {\n        _this.tablegrid.view.el.mask(\"Select a person\");\n        return false;\n    }\n    _this.tablegrid.view.el.unmask();\n \n    o.params = o.params || {};\n    var act = _this.actionSel.getValue();\n    if (act.length) {\n        o.params.action = act;\n    }\n    var tbl = _this.affectSel.getValue();\n    if (tbl.length) {\n        o.params.on_table = tbl;\n    }\n \n    act = _this.dateFrom.getValue();\n    if (act.format) {\n        o.params['query[from]'] = act.format('Y-m-d');\n    }\n    act = _this.dateTo.getValue();\n    if (act.format) {\n        o.params['query[to]'] = act.format('Y-m-d');\n    }\n    o.params.person_id = s.data.person_id;\n    o.params['query[table_sum]'] = 1;\n    o.params._columns = 'on_table,qty,uqty';\n\n    \n}"
                                             },
                                             "*prop": "dataSource",
                                             "remoteSort": true,

diff --git a/Pman.Tab.AdminLogDrill.js b/Pman.Tab.AdminLogDrill.js
index 53401a9..124c04e 100644 (file)
--- a/Pman.Tab.AdminLogDrill.js
+++ b/Pman.Tab.AdminLogDrill.js
@@ -368,8 +368,11 @@ Pman.Tab.AdminLogDrill = new Roo.util.Observable({
                                          if (! _this.dategrid) {
                                          return;
                                         }
-                                        if (_this.detailgrid) {
-                                            _this.detailgrid.ds.removeAll();
+                                        try {
+                                             _this.panel.layout.getRegion('east').getActivePanel().grid.ds.removeAll();
+                                             
+                                        } catch (e) {
+                                            // do nothing..
                                         }
                                         
                                         var s = _this.dategrid.selModel.getSelected();