jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/users'

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-04-18 15:19:38 -07:00
parent 6b1e14b464 cc28d49df4
commit 44bf299e10
10 changed files with 423 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webadmin/src/js/client.js
View File

@@ -498,13 +498,6 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
}).error(defaultErrorHandler(callback));
};
Client.prototype.listUsers = function (callback) {
$http.get(client.apiOrigin + '/api/v1/users').success(function(data, status) {
if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data));
callback(null, data);
}).error(defaultErrorHandler(callback));
};
Client.prototype.getOAuthClients = function (callback) {
$http.get(client.apiOrigin + '/api/v1/oauth/clients').success(function(data, status) {
if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data));
@@ -625,7 +618,7 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
newPassword: newPassword
};
$http.post(client.apiOrigin + '/api/v1/users/' + this._userInfo.id + '/password', data).success(function(data, status) {
$http.post(client.apiOrigin + '/api/v1/profile/' + this._userInfo.id + '/password', data).success(function(data, status) {
if (status !== 204) return callback(new ClientError(status, data));
callback(null, data);
}).error(defaultErrorHandler(callback));

4
webadmin/src/views/users.js
View File

@@ -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;
});
});