#346 Fix pagination and sort in users admin list

TheHive-Project · Nov 21, 2017 · c3aedd9 · c3aedd9
1 parent 39bd575
commit c3aedd9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/ui/app/scripts/controllers/admin/AdminUsersCtrl.js b/ui/app/scripts/controllers/admin/AdminUsersCtrl.js
@@ -13,7 +13,8 @@
              * users management page
              */
             $scope.userlist = PSearchSrv(undefined, 'user', {
-                scope: $scope
+                scope: $scope,
+                sort: '+name',
             });
             $scope.initNewUser = function() {
                 $scope.apiKey = false;

diff --git a/ui/app/views/partials/admin/users.html b/ui/app/views/partials/admin/users.html
@@ -3,8 +3,15 @@
         <h3 class="box-title">User management</h3>
     </div>
     <div class="box-body">
+        <div class="row">
+            <div class="col-xs-12">
+                <button class="btn btn-sm btn-primary" type="button" ng-click="showUserDialog()">Add user</button>
 
-        <button class="btn btn-sm btn-primary" type="button" ng-click="showUserDialog()">Add user</button>
+                <div class="btn-group pull-right" role="group">
+                    <page-sizer collection="userlist" sizes="[10, 15, 30, 100]"></page-sizer>
+                </div>
+            </div>
+        </div>
 
         <div class="row mt-xs">
             <div class="col-md-12">
@@ -20,7 +27,7 @@ <h3 class="box-title">User management</h3>
                         </tr>
                     </thead>
                     <tbody>
-                        <tr ng-repeat="user in userlist.values | orderBy:'id'">
+                        <tr ng-repeat="user in userlist.values">
                             <td ng-class="{ 'Locked':'text-muted', 'Ok':''}[user.status]">
                                 <a href ng-click="showUserDialog(user)"><strong>{{user.id}}</strong></a>
                             </td>