Merge branch 'version_4.4.1' of https://github.com/GluuFederation/oxT…

…rust into version_4.4.1
GluuFederation · Jul 11, 2022 · 84f48f7 · 84f48f7
2 parents 5288cec + be46293
commit 84f48f7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/server/src/main/java/org/gluu/oxtrust/action/UpdateAttributeAction.java b/server/src/main/java/org/gluu/oxtrust/action/UpdateAttributeAction.java
@@ -537,5 +537,9 @@ public GluuUserRole[] getAttributeEditTypes() {
     public GluuAttributeUsageType[] getAttributeUsageTypes() {
         return attributeService.getAttributeUsageTypes();
     }
+
+    public String getPersistenceType() {
+		return attributeService.getPersistenceType();
+	}
 
 }
diff --git a/server/src/main/webapp/WEB-INF/incl/attribute/attributeForm.xhtml b/server/src/main/webapp/WEB-INF/incl/attribute/attributeForm.xhtml
@@ -117,7 +117,7 @@
 						<h:selectBooleanCheckbox
 							value="#{_attribute.oxMultiValuedAttribute}" id="multivaluedId"
 							styleClass="form-control multivaluedField"
-							disabled="#{not _attributeAction.canEdit()}">
+							disabled="#{not _attributeAction.canEdit() or _attributeAction.persistenceType eq 'sql'}">
 							<a4j:ajax event="click" render="validation" />
 						</h:selectBooleanCheckbox>
 					</ox:decorate>

diff --git a/server/src/main/webapp/WEB-INF/incl/layout/fullWidthEmpty.xhtml b/server/src/main/webapp/WEB-INF/incl/layout/fullWidthEmpty.xhtml
@@ -151,10 +151,10 @@ a {
 			style="border-top: 2px solid #1ab26b !important; margin-bottom: 5px !important; margin-top: 1px !important; padding-top: 1px !important;"></div>
 		<div class="wrapper">
 			<div>
-				<b:growl id="growlMsg" globalOnly="true" placementFrom="top"
+				<!-- <b:growl id="growlMsg" globalOnly="true" placementFrom="top"
 					show-detail="true" show-summary="false" allowDismiss="true"
 					severity="info,warn,error,fatal" delay="3000" escape="true"
-					auto-update="true" />
+					auto-update="true" />-->
 				<ui:insert name="body" />
 			</div>
 		</div>

diff --git a/server/src/main/webapp/passwordResetResult.xhtml b/server/src/main/webapp/passwordResetResult.xhtml
@@ -14,8 +14,9 @@
     </ui:define>
     <ui:define name="body">
         <div class="body">
-            <b:messages redisplay="true" recursive="true"
-                        globalOnly="true" severity="info,warn,error,fatal" />
+            <h:messages globalOnly="true" id="messages"  styleClass="message">
+            <rich:notifyMessages  nonblocking="true" stayTime="2000" />
+            </h:messages>
         </div>
         <div class="lockscreen-wrapper" style="text-align: center;">
             <div class="lockscreen-logo" style="margin-bottom: 0px !important; margin-top: 10%;">

diff --git a/service/src/main/java/org/gluu/oxtrust/service/AttributeService.java b/service/src/main/java/org/gluu/oxtrust/service/AttributeService.java
@@ -636,5 +636,10 @@ public void setAttributeEditTypes(GluuUserRole[] attributeEditTypes) {
     protected BaseCacheService getCacheService() {
         return cacheService;
     }
+
+    public String getPersistenceType() {
+		return persistenceEntryManager.getPersistenceType();
+	}
+
 
 }