diff --git a/modules/users/client/controllers/admin/list-users.client.controller.js b/modules/users/client/controllers/admin/list-users.client.controller.js index 6bf0c2c9..923ca765 100644 --- a/modules/users/client/controllers/admin/list-users.client.controller.js +++ b/modules/users/client/controllers/admin/list-users.client.controller.js @@ -17,7 +17,7 @@ vm.searchVip = false; vm.searchAdmin = false; vm.searchOper = false; - vm.userStatus = 'normal'; + vm.userStatus = 'all'; /** * buildPager */ @@ -54,7 +54,7 @@ isOper: vm.searchOper || undefined, isAdmin: vm.searchAdmin || undefined, keys: vm.search, - status: vm.userStatus ? vm.userStatus : 'normal' + status: vm.userStatus ? vm.userStatus : 'all' }, function (data) { mtDebug.info(data); callback(data); diff --git a/modules/users/client/views/admin/list-users.client.view.html b/modules/users/client/views/admin/list-users.client.view.html index 2d2bdff2..4cac1b86 100644 --- a/modules/users/client/views/admin/list-users.client.view.html +++ b/modules/users/client/views/admin/list-users.client.view.html @@ -16,6 +16,10 @@
+ +
+ ng-class="{'span-banned': user.status == 'banned', 'span-idle': user.status == 'idle'}">

{{user.displayName}} - @@ -47,7 +55,7 @@

-

+

| {{user.status}}

diff --git a/modules/users/server/controllers/admin.server.controller.js b/modules/users/server/controllers/admin.server.controller.js index 2ed0f846..cebc275a 100644 --- a/modules/users/server/controllers/admin.server.controller.js +++ b/modules/users/server/controllers/admin.server.controller.js @@ -109,7 +109,7 @@ exports.list = function (req, res) { if (req.query.isAdmin !== undefined) { isAdmin = req.query.isAdmin; } - if (req.query.status !== undefined) { + if (req.query.status !== undefined && req.query.status !== 'all') { status = req.query.status; }