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 f021f12dbf74dbf843743c3abce5b3eb20cfa44c..abc38ae34e017578afd127af0502dcaadbb1a0f6 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 9ce346822c81ba0d94dc53f14be7c2f86b82f37d..775f150c5369d12777756c8e670e5060e437c1e3 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 57239ec42519137c55f7a3f3f0815dd983832993..9a6be3797affbe4d4556d7ba646b0f585e826fef 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>