X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Tab.PersonList.js;h=cf2c3134042a9b52e5e3e2fc0e267840d9c113c7;hp=fcd47cd4381b5c0714b2c70f90228c3ef121b8c4;hb=HEAD;hpb=46145707edd41c81d5987a05196ede4253f3e6b5 diff --git a/Pman.Tab.PersonList.js b/Pman.Tab.PersonList.js index fcd47cd4..8ee3fb1b 100644 --- a/Pman.Tab.PersonList.js +++ b/Pman.Tab.PersonList.js @@ -263,15 +263,18 @@ Pman.Tab.PersonList.prototype = { } var rec = _this.grid.ds.getAt(rowIndex); - + rec.set('active', rec.data.active ? 0 : 1); rec.commit(); - - var el = Roo.select('.x-grid-row-selected').item(3); - el.addClass('x-grid-row-fadeout'); - el.on('transitionend',function(){ - _this.grid.ds.remove(rec); - },this,{single:true}); + + // only hide if viewing active members... + if (!_this.showInActive) { + var el = Roo.select('.x-grid-row-selected').item(3); + el.addClass('x-grid-row-fadeout'); + el.on('transitionend',function(){ + _this.grid.ds.remove(rec); + },this,{single:true}); + } } @@ -561,8 +564,27 @@ Pman.Tab.PersonList.prototype = { } - } + }, + '->', + { + + xtype : 'Button', + xns : Roo.Toolbar, + + text: "Bulk Change Passwords", + hidden : _this.permName != 'Core.Staff' || !Pman.hasPerm('Core.Staff', 'E'), + listeners : { + click : function () { + Pman.Dialog.AdminBulkPassword.show({}, function() { + refreshPager(); + }); + + } + } + + + } ); @@ -629,10 +651,9 @@ Pman.Tab.PersonList.prototype = { return Roo.apply({ // id : (this.id + '-name').toLowerCase(), header : "Group Membership", - dataIndex : 'member_of_json', + dataIndex : 'member_of', sortable : false, - renderer : function(vv,p,r) { - var v = vv ? JSON.parse(vv).join("\n") : ''; + renderer : function(v,p,r) { if(r.data.active != 1){ return String.format('
{0}
', v).split("\n").join("
"); }