Pman.Tab.AdminProjectMembers.js

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

diff --git a/Pman.Tab.AdminProjectMembers.js b/Pman.Tab.AdminProjectMembers.js
index c483832..ccbc0e3 100644 (file)
--- a/Pman.Tab.AdminProjectMembers.js
+++ b/Pman.Tab.AdminProjectMembers.js
@@ -415,6 +415,7 @@ Pman.Tab.AdminProjectMembers = new Roo.util.Observable({
                                     if (pressed) {
                                         _this.grid.filter = 'S';
                                     }
+                                    _this.grid.footer.onClick('first');
                                 }
                             },
                             enableToggle : true,
@@ -428,12 +429,13 @@ Pman.Tab.AdminProjectMembers = new Roo.util.Observable({
                                 toggle : function (_self, pressed)
                                 {
                                     if (pressed) {
-                                        _this.grid.filter = 'S';
+                                        _this.grid.filter = 'O';
                                     }
+                                    _this.grid.footer.onClick('first');
                                 }
                             },
                             enableToggle : true,
-                            text : "Staff",
+                            text : "Owners",
                             toggleGroup : 'appm'
                         },
                         {
@@ -443,33 +445,18 @@ Pman.Tab.AdminProjectMembers = new Roo.util.Observable({
                                 toggle : function (_self, pressed)
                                 {
                                     if (pressed) {
-                                        _this.grid.filter = 'S';
+                                        _this.grid.filter = 'A';
                                     }
+                                    _this.grid.footer.onClick('first');
                                 }
                             },
                             enableToggle : true,
-                            text : "Staff",
+                            text : "Other",
                             toggleGroup : 'appm'
                         }
                     ]
                 },
                 colModel : [
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Id',
-                        width : 75,
-                        dataIndex : 'id',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Office',
-                        width : 75,
-                        dataIndex : 'office_id',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
                     {
                         xtype: 'ColumnModel',
                         xns: Roo.grid,
@@ -478,22 +465,6 @@ Pman.Tab.AdminProjectMembers = new Roo.util.Observable({
                         dataIndex : 'name',
                         renderer : function(v) { return String.format('{0}', v); }
                     },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Phone',
-                        width : 200,
-                        dataIndex : 'phone',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Fax',
-                        width : 200,
-                        dataIndex : 'fax',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
                     {
                         xtype: 'ColumnModel',
                         xns: Roo.grid,
@@ -505,81 +476,17 @@ Pman.Tab.AdminProjectMembers = new Roo.util.Observable({
                     {
                         xtype: 'ColumnModel',
                         xns: Roo.grid,
+                        dataIndex : 'company_id_name',
                         header : 'Company',
                         width : 75,
-                        dataIndex : 'company_id',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Role',
-                        width : 200,
-                        dataIndex : 'role',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Active',
-                        width : 75,
-                        dataIndex : 'active',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Remarks',
-                        width : 200,
-                        dataIndex : 'remarks',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Passwd',
-                        width : 200,
-                        dataIndex : 'passwd',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Owner',
-                        width : 75,
-                        dataIndex : 'owner_id',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Lang',
-                        width : 200,
-                        dataIndex : 'lang',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'No reset sent',
-                        width : 75,
-                        dataIndex : 'no_reset_sent',
-                        renderer : function(v) { return String.format('{0}', v); }
-                    },
-                    {
-                        xtype: 'ColumnModel',
-                        xns: Roo.grid,
-                        header : 'Action type',
-                        width : 200,
-                        dataIndex : 'action_type',
                         renderer : function(v) { return String.format('{0}', v); }
                     },
                     {
                         xtype: 'ColumnModel',
                         xns: Roo.grid,
-                        header : 'Project',
+                        dataIndex : 'is_member',
+                        header : 'Member',
                         width : 75,
-                        dataIndex : 'project_id',
                         renderer : function(v) { return String.format('{0}', v); }
                     }
                 ]