From b3f91c4868b47db4ef3373e54b7d9f9fa6abc860 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 4 Jan 2024 21:20:26 +0100
Subject: [PATCH] make branding and email config available to admin

---
 CHANGES                         |  2 ++
 dashboard/src/index.html        |  2 +-
 dashboard/src/views/emails.html | 14 +++++++-------
 dashboard/src/views/emails.js   |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1ce9b8f97..ecf335d1e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2728,3 +2728,5 @@
 [7.6.4]
 * mail: update limit plugin
 * ldap: fix error messages to show proper error messages in the external LDAP connector
+* dashboard: fix various UI elements hidden for admin user
+
diff --git a/dashboard/src/index.html b/dashboard/src/index.html
index 936991bd2..10adb215c 100644
--- a/dashboard/src/index.html
+++ b/dashboard/src/index.html
@@ -177,7 +177,7 @@
                         <li><a href="#/profile"><i class="fa fa-user fa-fw"></i> {{ 'profile.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastMailManager" class="divider"></li>
                         <li ng-show="user.isAtLeastAdmin"><a href="#/backups"><i class="fa fa-archive fa-fw"></i> {{ 'backups.title' | tr }}</a></li>
-                        <li ng-show="user.isAtLeastOwner"><a href="#/branding"><i class="fa fa-passport fa-fw"></i> {{ 'branding.title' | tr }}</a></li>
+                        <li ng-show="user.isAtLeastAdmin"><a href="#/branding"><i class="fa fa-passport fa-fw"></i> {{ 'branding.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastAdmin"><a href="#/domains"><i class="fa fa-globe fa-fw"></i> {{ 'domains.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastMailManager"><a href="#/email"><i class="fa fa-envelope fa-fw"></i> {{ 'emails.title' | tr }}</a></li>
                         <li ng-show="user.isAtLeastAdmin"><a href="#/eventlog"><i class="fa fa-list-alt fa-fw"></i> {{ 'eventlog.title' | tr }}</a></li>
diff --git a/dashboard/src/views/emails.html b/dashboard/src/views/emails.html
index 18e2bf28d..bd111598d 100644
--- a/dashboard/src/views/emails.html
+++ b/dashboard/src/views/emails.html
@@ -156,8 +156,8 @@
       {{ 'emails.title' | tr }}
 
       <div class="pull-right">
-        <a class="btn btn-default" ng-show="user.isAtLeastOwner" href="#/emails-queue">{{ 'emails.action.queue' | tr }}</a>
-        <a class="btn btn-default" ng-show="user.isAtLeastOwner" href="#/emails-eventlog">{{ 'eventlog.title' | tr }}</a>
+        <a class="btn btn-default" ng-show="user.isAtLeastAdmin" href="#/emails-queue">{{ 'emails.action.queue' | tr }}</a>
+        <a class="btn btn-default" ng-show="user.isAtLeastAdmin" href="#/emails-eventlog">{{ 'eventlog.title' | tr }}</a>
       </div>
     </h1>
   </div>
@@ -213,11 +213,11 @@
   </div>
 
   <!-- mailbox sharing -->
-  <div class="text-left section-header" ng-show="user.isAtLeastOwner">
+  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
     <h3>{{ 'emails.mailboxSharing.title' | tr }}</h3>
   </div>
 
-  <div class="card" ng-show="user.isAtLeastOwner" style="margin-bottom: 15px;">
+  <div class="card" ng-show="user.isAtLeastAdmin" style="margin-bottom: 15px;">
     <div class="row">
       <div class="col-md-12">
         <p>{{ 'emails.mailboxSharing.description' | tr }}</p>
@@ -234,7 +234,7 @@
   </div>
 
   <!-- server location -->
-  <div class="text-left section-header" ng-show="user.isAtLeastOwner">
+  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
     <h3>
       {{ 'emails.settings.location' | tr }}
       <div class="btn-group btn-group-sm pull-right">
@@ -302,11 +302,11 @@
   </div>
 
   <!-- settings -->
-  <div class="text-left section-header" ng-show="user.isAtLeastOwner">
+  <div class="text-left section-header" ng-show="user.isAtLeastAdmin">
     <h3>{{ 'emails.settings.title' | tr }}</h3>
   </div>
 
-  <div class="card" ng-show="user.isAtLeastOwner" style="margin-bottom: 15px;">
+  <div class="card" ng-show="user.isAtLeastAdmin" style="margin-bottom: 15px;">
     <p ng-bind-html=" 'emails.settings.info' | tr "></p>
     <div class="row">
       <div class="col-xs-6">
diff --git a/dashboard/src/views/emails.js b/dashboard/src/views/emails.js
index f2dc72103..ff507efb5 100644
--- a/dashboard/src/views/emails.js
+++ b/dashboard/src/views/emails.js
@@ -454,7 +454,7 @@ angular.module('Application').controller('EmailsController', ['$scope', '$locati
             $scope.domains = domains;
             $scope.ready = true;
 
-            if ($scope.user.isAtLeastOwner) {
+            if ($scope.user.isAtLeastAdmin) {
                 $scope.mailLocation.refresh();
                 $scope.maxEmailSize.refresh();
                 $scope.virtualAllMail.refresh();