From 8f2fd2058ef44426759e430698a4cbe3cc947f5f Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sun, 3 Dec 2017 16:47:57 +0800
Subject: [PATCH] feat(users): admin list all user by every status value

---
 .../admin/list-users.client.controller.js            |  4 ++--
 .../client/views/admin/list-users.client.view.html   | 12 ++++++++++--
 .../server/controllers/admin.server.controller.js    |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

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 @@
                 </label>
 
                 <div>
+                    <label class="radio-inline">
+                        <input type="radio" name="status_normal" ng-model="vm.userStatus"
+                               id="status_all" value="all" ng-change="vm.buildPager();"> all
+                    </label>
                     <label class="radio-inline">
                         <input type="radio" name="status_normal" ng-model="vm.userStatus"
                                id="status_normal" value="normal" ng-change="vm.buildPager();"> normal
@@ -24,6 +28,10 @@
                         <input type="radio" name="status_banned" ng-model="vm.userStatus"
                                id="status_banned" value="banned" ng-change="vm.buildPager();"> banned
                     </label>
+                    <label class="radio-inline">
+                        <input type="radio" name="status_banned" ng-model="vm.userStatus"
+                               id="status_idle" value="idle" ng-change="vm.buildPager();"> idle
+                    </label>
                     <label class="radio-inline">
                         <input type="radio" name="status_inactive" ng-model="vm.userStatus"
                                id="status_inactive" value="inactive" ng-change="vm.buildPager();"> inactive
@@ -38,7 +46,7 @@
     </div>
     <div class="list-group">
         <a ng-repeat="user in vm.pagedItems" ui-sref="admin.user({userId: user._id})" class="list-group-item"
-           ng-class="{'span-banned': user.status == 'banned'}">
+           ng-class="{'span-banned': user.status == 'banned', 'span-idle': user.status == 'idle'}">
             <img class="ulist-avatar" ng-src="{{user.profileImageURL}}">
 
             <h4 class="list-group-item-heading">{{user.displayName}} <span vip-flag="user"></span> -
@@ -47,7 +55,7 @@
 
             <p class="list-group-item-text pull-right small" ng-bind="user.roles"></p>
 
-            <p class="list-group-item-text" ng-bind="user.email"></p>
+            <p class="list-group-item-text"><span ng-bind="user.email"></span> | <strong>{{user.status}}</strong></p>
         </a>
     </div>
 
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;
   }