Pman.Tab.AdminProjectMembers.js

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

diff --git a/Pman.Tab.AdminProjectMembers.js b/Pman.Tab.AdminProjectMembers.js
index bc21799..09c7c11 100644 (file)
--- a/Pman.Tab.AdminProjectMembers.js
+++ b/Pman.Tab.AdminProjectMembers.js
@@ -50,8 +50,6 @@ Pman.Tab.AdminProjectMembers = new Roo.util.Observable({
             grid : {
                 xtype: 'Grid',
                 xns: Roo.grid,
-                autoExpandColumn : 'name',
-                loadMask : true,
                 listeners : {
                     render : function() 
                     {
@@ -69,36 +67,41 @@ Pman.Tab.AdminProjectMembers = new Roo.util.Observable({
                         }); 
                     }
                 },
+                filter : 'S',
+                autoExpandColumn : 'name',
+                loadMask : true,
                 dataSource : {
                     xtype: 'Store',
                     xns: Roo.data,
                     listeners : {
                         beforeload : function (_self, options)
                         {
-                            options.params.project_member_filtertype = this.filter;
-                            options.params.project_member_filter = _this.memberFilter.pressed;
-                            var pm = Pman.Tab.AdminProjectManager;
+                            if (!_this.memberBtn) {
+                                return false;
+                            }
+                            options.params['query[project_member_filter]'] = _this.memberBtn.pressed ? 1 :0;
+                            var pm = Pman ? Pman.Tab.AdminProjectManager :false;
                             if (!pm || !pm.grid || !pm.grid.getSelectionModel().getSelected()) {
                                 return false;
                             }
                             var sel = pm.grid.getSelectionModel().getSelected();
-                            switch(this.filter) {
+                            options.params['query[project_member_of]'] = sel.data.id;    
+                            switch(_this.grid.filter) {
                                 case 'S': // staff
                                     options.params.company_id_comptype='OWNER';
-                                    options.params.project_member_of = sel.data.id;
+                        
                                     break;
                                 case 'O': // owner..
-                                    options.params.company_id = sel.data.owner_id;
-                                    options.params.project_member_of = sel.data.id;
-                                case 'A': // owner..
-                                    options.params['!company_id'] = sel.data.owner_id;
+                                    options.params.company_id = sel.data.client_id;
+                                    break;
+                                case 'A': // not owner or staff..
+                                    options.params['!company_id'] = sel.data.client_id;
                                     options.params['!company_id_comptype'] ='OWNER';
-                                    options.params.project_member_of = sel.data.id;        
+                                    break;      
                             }
                             
                         }
                     },
-                    filter : 'S',
                     remoteSort : true,
                     sortInfo : { field : 'name', direction: 'ASC' },
                     proxy : {