X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Tab.PersonList.js;h=cf2c3134042a9b52e5e3e2fc0e267840d9c113c7;hp=258cc01446df90d785e254a33fa5bbfc5e29686f;hb=HEAD;hpb=9b653e413576082e2994f5c6a9a44423ec1bf68d diff --git a/Pman.Tab.PersonList.js b/Pman.Tab.PersonList.js index 258cc014..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}); + } } @@ -458,10 +461,10 @@ Pman.Tab.PersonList.prototype = { //Pman.genericDelete(_this, 'Person'); var rec = _this.grid.ds.getAt(_this.grid.selModel.last); - console.log(_this.paging.onClick('refresh');); - var ids = []; - ids.push(rec.id); - if (!ids.length) { + + var rec_id = rec.id; + + if (rec_id * 1 < 1) { Roo.MessageBox.alert("Error", "Select row to delete"); return; } @@ -477,11 +480,11 @@ Pman.Tab.PersonList.prototype = { method : 'POST', url : baseURL + '/Roo/core_person', params : { - _delete : ids.join(',') + _delete : rec_id }, success : function() { - - _this.grid.footer.onClick('refresh'); + _this.paging.onClick('refresh'); + //_this.grid.footer.onClick('refresh'); } }); } @@ -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(); + }); + + } + } + + } ); @@ -623,6 +645,24 @@ Pman.Tab.PersonList.prototype = { // width : 150 }, cfg); }, + + c_group_membership : function(cfg) { + cfg = cfg || {}; + return Roo.apply({ + // id : (this.id + '-name').toLowerCase(), + header : "Group Membership", + dataIndex : 'member_of', + sortable : false, + renderer : function(v,p,r) { + if(r.data.active != 1){ + return String.format('
{0}
', v).split("\n").join("
"); + } + return String.format('{0}', v).split("\n").join("
"); + }, + width : 150 + }, cfg); + }, + c_company_id_comptype : function(cfg) { cfg = cfg || {}; return Roo.apply({