(empire-db) branch master updated: EMPIREDB-445 TagEncodingHelper: check ReadOnly if ValueExpression is supplied

[doebele]

This is an automated email from the ASF dual-hosted git repository.

doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new b5b5c15c EMPIREDB-445 TagEncodingHelper: check ReadOnly if 
ValueExpression is supplied
b5b5c15c is described below

commit b5b5c15c28199932e6f6e2f01f7d10672d559a1b
Author: Rainer Döbele <rdoeb...@users.noreply.github.com>
AuthorDate: Thu Nov 7 21:17:55 2024 +0100

    EMPIREDB-445
    TagEncodingHelper: check ReadOnly if ValueExpression is supplied
---
 .../java/org/apache/empire/jakarta/utils/TagEncodingHelper.java    | 7 +++++--
 .../main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
index f84dc516..050d583d 100644
--- 
a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
+++ 
b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
@@ -941,8 +941,11 @@ public class TagEncodingHelper implements NamingContainer
             return ObjectUtils.getBoolean(val);
         }
         // if value expression, don't check further
-        if (hasValueExpression())
-            return null;
+        if (hasValueExpression()) 
+        {   // check readonly
+            ValueExpression ve = findValueExpression("value");
+            return (ve!=null ? 
ve.isReadOnly(FacesContext.getCurrentInstance().getELContext()) : null);
+        }
         // check record component
         if (recordTag != null && recordTag.isReadOnly())
             return true;
diff --git 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index b8b7bcf5..95b8ba6a 100644
--- 
a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++ 
b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -941,8 +941,11 @@ public class TagEncodingHelper implements NamingContainer
             return ObjectUtils.getBoolean(val);
         }
         // if value expression, don't check further
-        if (hasValueExpression())
-            return null;
+        if (hasValueExpression()) 
+        {   // check readonly
+            ValueExpression ve = findValueExpression("value");
+            return (ve!=null ? 
ve.isReadOnly(FacesContext.getCurrentInstance().getELContext()) : null);
+        }
         // check record component
         if (recordTag != null && recordTag.isReadOnly())
             return true;