Merge remote-tracking branch 'origin/users'

2016-04-18 15:19:38 -07:00
parent 6b1e14b464 cc28d49df4
commit 44bf299e10
10 changed files with 423 additions and 215 deletions
--- a/webadmin/src/views/users.js
+++ b/webadmin/src/views/users.js
@@ -331,10 +331,10 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio

            $scope.groups = result;

-            Client.listUsers(function (error, result) {
+            Client.getUsers(function (error, result) {
                if (error) return console.error('Unable to get user listing.', error);

-                $scope.users = result.users;
+                $scope.users = result;
                $scope.ready = true;
            });
        });