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

Remove password entry from user edit form

Browse Source
This commit is contained in:
Johannes Zellner
2016-02-25 14:15:48 +01:00
parent 160467e199
commit f600ebcf19
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -607,9 +607,8 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification',
}).error(defaultErrorHandler(callback));
};
Client.prototype.updateUser = function (user, password, callback) {
Client.prototype.updateUser = function (user, callback) {
var data = {
password: password,
email: user.email,
displayName: user.displayName
};

8
webadmin/src/views/users.html
View File

@@ -130,14 +130,6 @@
</span>
</div>
</div>
<div class="form-group" ng-class="{ 'has-error': (useredit_form.password.$dirty && useredit_form.password.$invalid) || (!useredit_form.password.$dirty && useredit.error.password)}">
<label class="control-label">Give your password to verify that you are performing that action</label>
<div class="control-label" ng-show="(!useredit_form.password.$dirty && useredit.error.password) || (useredit_form.password.$dirty && useredit_form.password.$invalid)">
<small ng-show="useredit_form.password.$error.required && !useredit.error.password">A password is required</small>
<small ng-show="!useredit_form.password.$dirty && useredit.error.password">{{ useredit.error.password }}</small>
</div>
<input type="password" class="form-control" ng-model="useredit.password" name="password" id="inputUserEditPassword" placeholder="Password" required>
</div>
<input class="hide" type="submit" ng-disabled="useredit_form.$invalid || useredit.busy"/>
</form>
</div>

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

@@ -31,8 +31,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
error: {},
userInfo: {},
email: '',
displayName: '',
password: ''
displayName: ''
};
$scope.showBubble = function ($event) {
@@ -231,7 +230,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
};
$scope.showUserEdit = function (userInfo) {
$scope.useredit.error.password = null;
$scope.useredit.error.displayName = null;
$scope.useredit.error.email = null;
$scope.useredit.displayName = userInfo.displayName;
@@ -257,7 +255,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.doUserEdit = function () {
$scope.useredit.error.displayName = null;
$scope.useredit.error.email = null;
$scope.useredit.error.password = null;
$scope.useredit.busy = true;
var data = {
@@ -266,15 +263,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
displayName: $scope.useredit.displayName
};
Client.updateUser(data, $scope.useredit.password, function (error) {
if (error && error.statusCode === 403) {
$scope.useredit.busy = false;
$scope.useredit.error.password = 'Wrong password';
$scope.useredit.password = '';
$scope.useredit_form.password.$setPristine();
$('#inputUserEditPassword').focus();
return;
}
Client.updateUser(data, function (error) {
if (error) {
$scope.useredit.busy = false;
return console.error('Unable to update user:', error);
@@ -288,7 +277,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.useredit.userInfo = {};
$scope.useredit.email = '';
$scope.useredit.displayName = '';
$scope.useredit.password = '';
$scope.useredit.groupIds = [];
$scope.useredit_form.$setPristine();