From 7b7e94d3d6e3ba7eb7c5f33067611f055e3685a6 Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Tue, 23 Jan 2018 17:09:47 +0100 Subject: [PATCH] Not sure what to do yet with alias ui in users settings, so disable to make the ui itself work --- webadmin/src/views/users.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/webadmin/src/views/users.js b/webadmin/src/views/users.js index 0b3a8ccd5..264d9dfa1 100644 --- a/webadmin/src/views/users.js +++ b/webadmin/src/views/users.js @@ -11,7 +11,11 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio $scope.groupsById = { }; $scope.config = Client.getConfig(); $scope.userInfo = Client.getUserInfo(); - $scope.mailConfig = {}; + + // FIXME this needs a whole lot of rework as it is used for alias ui, which now needs to be multidomain aware + $scope.mailConfig = { + enabled: false + }; $scope.userremove = { busy: false, @@ -409,18 +413,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio }); } - function getMailConfig() { - Client.getMailConfig(function (error, mailConfig) { - if (error) return console.error(error); - - $scope.mailConfig = mailConfig; - }); - } - - Client.onReady(function () { - getMailConfig(); - refresh(); - }); + Client.onReady(refresh); // setup all the dialog focus handling ['userAddModal', 'userRemoveModal', 'userEditModal', 'groupAddModal', 'groupRemoveModal'].forEach(function (id) {