diff --git a/src/js/client.js b/src/js/client.js index 6d2ead23b..cfdfae414 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -106,9 +106,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout return callback(new ClientError('Request cancelled by browser')); } - // 401 is when the token is invalid. 403 can happen when the token is valid but missing scopes (like when user became admin) // re-login will make the code get a new token - if (status === 401 || status === 403) return client.login(); + if (status === 401) return client.login(); if (status === 500 || status === 501) { if (!client.offline) client.error(data); diff --git a/src/views/users.html b/src/views/users.html index 94cd1652d..f40b44fb9 100644 --- a/src/views/users.html +++ b/src/views/users.html @@ -75,13 +75,12 @@ diff --git a/src/views/users.js b/src/views/users.js index 964d1b68b..e3d7fae83 100644 --- a/src/views/users.js +++ b/src/views/users.js @@ -50,11 +50,11 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.userremove = { busy: false, - error: {}, + error: null, userInfo: {}, show: function (userInfo) { - $scope.userremove.error.username = null; + $scope.userremove.error = null; $scope.userremove.userInfo = userInfo; $('#userRemoveModal').modal('show'); @@ -66,7 +66,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio Client.removeUser($scope.userremove.userInfo.id, function (error) { $scope.userremove.busy = false; - if (error) return console.error('Unable to delete user.', error); + if (error && error.statusCode === 403) return $scope.userremove.error = 'You are not allowed to delete this user.'; + else if (error) return console.error('Unable to delete user.', error); $scope.userremove.userInfo = {};