Pman.Tab.AdminProjectMembers.bjs

[Pman.Admin] / Pman.Tab.AdminProjectMembers.bjs

diff --git a/Pman.Tab.AdminProjectMembers.bjs b/Pman.Tab.AdminProjectMembers.bjs
index b048890..33b109f 100644 (file)
--- a/Pman.Tab.AdminProjectMembers.bjs
+++ b/Pman.Tab.AdminProjectMembers.bjs
@@ -19,22 +19,22 @@
             "|xns": "Roo",
             "items": [
                 {
-                    "*prop": "grid",
-                    "xtype": "Grid",
-                    "autoExpandColumn": "name",
-                    "loadMask": true,
                     "listeners": {
                         "|render": "function() \n{\n    _this.grid = this; \n    //_this.dialog = Pman.Dialog.FILL_IN\n    if (_this.panel.active) {\n       this.footer.onClick('first');\n    }\n}",
                         "|rowdblclick": "function (_self, rowIndex, e)\n{\n    if (!_this.dialog) return;\n    _this.dialog.show( this.getDataSource().getAt(rowIndex), function() {\n        _this.grid.footer.onClick('first');\n    }); \n}\n"
                     },
+                    "filter": "S",
+                    "*prop": "grid",
+                    "autoExpandColumn": "name",
+                    "loadMask": true,
+                    "xtype": "Grid",
                     "|xns": "Roo.grid",
                     "items": [
                         {
                             "listeners": {
-                                "beforeload": "function (_self, options)\n{\n    options.params.project_member_filter = _this.memberFilter.pressed;\n    var pm = Pman.Tab.AdminProjectManager;\n    if (!pm || !pm.grid || !pm.grid.getSelectionModel().getSelected()) {\n        return false;\n    }\n    var sel = pm.grid.getSelectionModel().getSelected();\n    switch(this.filter) {\n        case 'S': // staff\n            options.params.company_id_comptype='OWNER';\n            options.params.project_member_of = sel.data.id;\n            break;\n        case 'O': // owner..\n            options.params.company_id = sel.data.owner_id;\n            options.params.project_member_of = sel.data.id;\n        case 'A': // not owner or staff..\n            options.params['!company_id'] = sel.data.owner_id;\n            options.params['!company_id_comptype'] ='OWNER';\n            options.params.project_member_of = sel.data.id;        \n    }\n    \n}"
+                                "beforeload": "function (_self, options)\n{\n    if (!_this.memberBtn) {\n        return false;\n    }\n    options.params.project_member_filter = _this.memberBtn.pressed;\n    var pm = Pman.Tab.AdminProjectManager;\n    if (!pm || !pm.grid || !pm.grid.getSelectionModel().getSelected()) {\n        return false;\n    }\n    var sel = pm.grid.getSelectionModel().getSelected();\n    switch(_this.grid.filter) {\n        case 'S': // staff\n            options.params.company_id_comptype='OWNER';\n            options.params.project_member_of = sel.data.id;\n            break;\n        case 'O': // owner..\n            options.params.company_id = sel.data.owner_id;\n            options.params.project_member_of = sel.data.id;\n            break;\n        case 'A': // not owner or staff..\n            options.params['!company_id'] = sel.data.client_id;\n            options.params['!company_id_comptype'] ='OWNER';\n            options.params.project_member_of = sel.data.id;        \n    }\n    \n}"
                             },
                             "*prop": "dataSource",
-                            "filter": "S",
                             "remoteSort": true,
                             "xtype": "Store",
                             "|sortInfo": "{ field : 'name', direction: 'ASC' }",