diff --git a/CHANGES b/CHANGES index f2e21ef34..cd69cd348 100644 --- a/CHANGES +++ b/CHANGES @@ -2703,4 +2703,5 @@ * dashboard: remove nginx config of old domain when domain changed * Show disk consumption of docker volumes for /run and /tmp of apps separately * dns: add dnsimple automation +* roles: admin role can access branding and networking diff --git a/dashboard/src/views/branding.js b/dashboard/src/views/branding.js index 2e81d755e..eb7e51c93 100644 --- a/dashboard/src/views/branding.js +++ b/dashboard/src/views/branding.js @@ -4,7 +4,7 @@ /* global $:false */ angular.module('Application').controller('BrandingController', ['$scope', '$location', 'Client', function ($scope, $location, Client) { - Client.onReady(function () { if (Client.getUserInfo().role !== 'owner') $location.path('/'); }); + Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); }); $scope.user = Client.getUserInfo(); $scope.config = Client.getConfig(); diff --git a/dashboard/src/views/emails-eventlog.js b/dashboard/src/views/emails-eventlog.js index 5057b8293..b6d481e16 100644 --- a/dashboard/src/views/emails-eventlog.js +++ b/dashboard/src/views/emails-eventlog.js @@ -4,7 +4,7 @@ /* global angular */ angular.module('Application').controller('EmailsEventlogController', ['$scope', '$location', '$translate', '$timeout', 'Client', function ($scope, $location, $translate, $timeout, Client) { - Client.onReady(function () { if (!Client.getUserInfo().isAtLeastOwner) $location.path('/'); }); + Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); }); $scope.ready = false; $scope.config = Client.getConfig(); diff --git a/dashboard/src/views/emails-queue.js b/dashboard/src/views/emails-queue.js index 6c5624e7b..f0bdaf682 100644 --- a/dashboard/src/views/emails-queue.js +++ b/dashboard/src/views/emails-queue.js @@ -4,7 +4,7 @@ /* global angular */ angular.module('Application').controller('EmailsQueueController', ['$scope', '$location', '$translate', '$timeout', 'Client', function ($scope, $location, $translate, $timeout, Client) { - Client.onReady(function () { if (!Client.getUserInfo().isAtLeastOwner) $location.path('/'); }); + Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); }); $scope.ready = false; $scope.config = Client.getConfig(); diff --git a/dashboard/src/views/network.html b/dashboard/src/views/network.html index 9ec701119..ed8ae0285 100644 --- a/dashboard/src/views/network.html +++ b/dashboard/src/views/network.html @@ -251,11 +251,11 @@ -