From a21a21660135a3cf335e71edabee7f0face34255 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 3 Jul 2012 11:35:32 +0800 Subject: [PATCH] Pman.Tab.AdminContacts.bjs Pman.Tab.AdminContacts.js --- Pman.Tab.AdminContacts.bjs | 2 +- Pman.Tab.AdminContacts.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Pman.Tab.AdminContacts.bjs b/Pman.Tab.AdminContacts.bjs index 0abe83c..ef8f46f 100644 --- a/Pman.Tab.AdminContacts.bjs +++ b/Pman.Tab.AdminContacts.bjs @@ -35,7 +35,7 @@ "items": [ { "listeners": { - "beforeload": "function (_self, o)\n{\n \n o.params['!company_id_comptype'] = 'OWNER';\n \n o.params['query[search]'] = _this.searchBox.getValue();\n \n if (!_this.activeButton) {return; false;}\n \n if (_this.companyCombo && _this.companyCombo.getValue()) {\n o.params.company_id = _this.companyCombo.getValue();\n }\n \n \n o.params.active = _this.activeButton.pressed ? 0 : 1;\n \n if(_this.active_company_button.pressed){\n o.params.company_id = 0;\n }\n if (!Pman.Tab.AdminContactsGroup) { \n return false;\n }\n \n \n if (Pman.Tab.AdminContactsGroup && Pman.Tab.AdminContactsGroup.grid) {\n var tms = Pman.Tab.AdminContactsGroup.grid.getSelectionModel().getSelected();\n \n if (!tms) {\n return false;\n }\n o.params['query[in_group]'] = tms.data.id;\n o.params['query[type]'] = 2; // group type..\n \n }\n //o.params['query[name]'] = _this.searchBox.getValue();\n \n}", + "beforeload": "function (_self, o)\n{\n if(!_this.active_company_button.pressed){\n o.params['!company_id_comptype'] = 'OWNER';\n }\n \n o.params['query[search]'] = _this.searchBox.getValue();\n \n if (!_this.activeButton) {return; false;}\n \n if (_this.companyCombo && _this.companyCombo.getValue()) {\n o.params.company_id = _this.companyCombo.getValue();\n }\n \n \n o.params.active = _this.activeButton.pressed ? 0 : 1;\n \n if(_this.active_company_button.pressed){\n o.params.company_id = 0;\n }\n if (!Pman.Tab.AdminContactsGroup) { \n return false;\n }\n \n \n if (Pman.Tab.AdminContactsGroup && Pman.Tab.AdminContactsGroup.grid) {\n var tms = Pman.Tab.AdminContactsGroup.grid.getSelectionModel().getSelected();\n \n if (!tms) {\n return false;\n }\n o.params['query[in_group]'] = tms.data.id;\n o.params['query[type]'] = 2; // group type..\n \n }\n //o.params['query[name]'] = _this.searchBox.getValue();\n \n}", "update": "function (_self, record, operation)\n{\n if (operation != 'commit') {\n return;\n }\n // only used to change active status.\n \n new Pman.Request({\n url : baseURL + '/Roo/Person.php',\n method :'POST',\n params : {\n id : record.data.id,\n active: record.data.active\n \n },\n success : function() {\n // do nothing\n \n _this.grid.ds.remove(record);\n \n },\n failure : function() \n {\n Roo.MessageBox.alert(\"Error\", \"saving failed\", function() {\n _this.grid.footer.onClick('first');\n });\n }\n });\n}" }, "*prop": "dataSource", diff --git a/Pman.Tab.AdminContacts.js b/Pman.Tab.AdminContacts.js index 018eaf7..cbb4031 100644 --- a/Pman.Tab.AdminContacts.js +++ b/Pman.Tab.AdminContacts.js @@ -81,8 +81,9 @@ Pman.Tab.AdminContacts = new Roo.XComponent({ listeners : { beforeload : function (_self, o) { - - o.params['!company_id_comptype'] = 'OWNER'; + if(!_this.active_company_button.pressed){ + o.params['!company_id_comptype'] = 'OWNER'; + } o.params['query[search]'] = _this.searchBox.getValue(); -- 2.39.2