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

Rework the external ldap ui to follow usual modal dialog pattern

Browse Source
This commit is contained in:
Johannes Zellner
2019-08-30 12:40:23 +02:00
parent b4248acd9a
commit ebab88e7aa
2 changed files with 85 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/views/users.js
View File

@@ -416,8 +416,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.externalLdap = {
busy: false,
error: {},
success: false,
syncBusy: false,
taskId: 0,
// fields
enabled: false,
@@ -437,6 +437,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
return;
}
$scope.externalLdap.taskId = taskId;
function refreshTaskStatus() {
Client.getTask(taskId, function (error, result) {
if (error) console.error(error);
@@ -450,10 +452,16 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
});
},
show: function () {
$scope.externalLdap.busy = false;
$scope.externalLdap.error = {};
$('#externalLdapModal').modal('show');
},
submit: function () {
$scope.externalLdap.busy = true;
$scope.externalLdap.error = {};
$scope.externalLdap.success = false;
var config = {
enabled: $scope.externalLdap.enabled,
@@ -484,7 +492,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.externalLdap.error.generic = error.message;
}
} else {
$scope.externalLdap.success = true;
$('#externalLdapModal').modal('hide');
}
});
}
@@ -575,6 +583,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.externalLdap.filter = result.filter;
$scope.externalLdap.bindDn = result.bindDn;
$scope.externalLdap.bindPassword = result.bindPassword;
Client.getLatestTaskByType('syncExternalLdap', function (error, task) {
if (error) return console.error(error);
if (!task) return;
$scope.externalLdap.taskId = task.id;
});
});
}