From 776ecfdb3b023018e87baf76b9e278d5bc0aabc1 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Fri, 16 Apr 2021 05:55:28 +0900
Subject: [PATCH] fix #2558 disable menus on aws
---
src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp | 2 +-
.../webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp | 2 +-
src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
index f021f12db..abc38ae34 100644
--- a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
@@ -84,7 +84,7 @@
<div class="form-inline col-sm-9">
<la:errors property="resultCollapsed"/>
<div class="form-check">
- <la:checkbox styleId="resultCollapsed" styleClass="form-check-input" property="resultCollapsed" disabled="${fesenType=='cloud'}"/>
+ <la:checkbox styleId="resultCollapsed" styleClass="form-check-input" property="resultCollapsed" disabled="${fesenType=='cloud' or fesenType=='aws'}"/>
<label for="resultCollapsed" class="form-check-label">
<la:message key="labels.enabled"/>
</label>
diff --git a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
index 9ce346822..775f150c5 100644
--- a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
@@ -63,7 +63,7 @@
<div class="form-inline col-sm-9">
<la:errors property="resetDictionaries"/>
<div class="form-check">
- <la:checkbox styleId="resetDictionaries" styleClass="form-check-input" property="resetDictionaries" disabled="${fesenType=='cloud'}"/>
+ <la:checkbox styleId="resetDictionaries" styleClass="form-check-input" property="resetDictionaries" disabled="${fesenType=='cloud' or fesenType=='aws'}"/>
<label for="resetDictionaries" class="form-check-label">
<la:message key="labels.enabled"/>
</label>
diff --git a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
index 57239ec42..9a6be3797 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
@@ -75,7 +75,7 @@
<p><la:message key="labels.menu_design" /></p>
</a></li></c:if>
- <c:if test="${fe:permission('admin-dict-view') and fesenType!='cloud'}">
+ <c:if test="${fe:permission('admin-dict-view') and fesenType!='cloud' and fesenType!='aws'}">
<li class="nav-item">
<a href="${fe:url('/admin/dict/')}" class="nav-link <c:if test="${param.menuType=='dict'}">active</c:if>">
<em class='fa fa-genderless nav-icon'></em>
--
GitLab