Fix #827: o:validateBean showMessageFor="@Violating" didn't work when

bean is directly referenced in input component (with converter)
omnifaces · Jul 28, 2024 · 5d7816d · 5d7816d
1 parent 01fbec6
commit 5d7816d
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/org/omnifaces/taghandler/ValidateBean.java b/src/main/java/org/omnifaces/taghandler/ValidateBean.java
@@ -549,10 +549,19 @@ private static void forEachInputWithMatchingBase(FacesContext context, UICompone
 
 				if (valueExpression != null) {
 					ValueReference valueReference = getValueReference(context.getELContext(), valueExpression);
+					Object referencedBase = valueReference.getBase();
+					Object referencedProperty = valueReference.getProperty();
 
-					if (bases.contains(valueReference.getBase()) && (property == null || property.equals(valueReference.getProperty()))) {
+                    if (bases.contains(referencedBase) && (property == null || property.equals(referencedProperty))) {
 						callback.invoke(input);
 					}
+                    else if (property == null && referencedBase instanceof List && referencedProperty instanceof Integer) {
+                        Object referencedItem = ((List<?>) referencedBase).get((Integer) referencedProperty);
+
+                        if (bases.contains(referencedItem)) {
+                            callback.invoke(input);
+                        }
+                    }
 				}
 			});
 	}