(ofbiz-framework) branch release24.09 updated: Fixed issue where include-form tag failed when referencing a grid (OFBIZ-13290)

[deepak]

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

deepak pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release24.09 by this push:
     new 2e2f41bf7d Fixed issue where include-form tag failed when referencing 
a grid (OFBIZ-13290)
2e2f41bf7d is described below

commit 2e2f41bf7d2114b6610b00ddb7f8ce8105067484
Author: Deepak Dixit <dee...@apache.org>
AuthorDate: Sat Sep 6 15:49:18 2025 +0530

    Fixed issue where include-form tag failed when referencing a grid
    (OFBIZ-13290)
---
 .../src/main/java/org/apache/ofbiz/widget/model/FormFactory.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
index b129107712..1fc0a9c8f9 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java
@@ -146,13 +146,20 @@ public class FormFactory {
             rootElement = UtilXml.firstChildElement(rootElement, "forms");
         }
         Element formElement = UtilXml.firstChildElement(rootElement, "form", 
"name", formName);
+        if (formElement == null) {
+            // look for grid definition
+            formElement = UtilXml.firstChildElement(rootElement, "grid", 
"name", formName);
+        }
+        if (formElement == null) {
+            throw new IllegalArgumentException("Could not find form with name 
[" + formName + "] in class resource [" + formLocation + "]");
+        }
         return createModelForm(formElement, entityModelReader, visualTheme, 
dispatchContext, formLocation, formName);
     }
 
     public static ModelForm createModelForm(Element formElement, ModelReader 
entityModelReader, VisualTheme visualTheme,
                                             DispatchContext dispatchContext, 
String formLocation, String formName) {
         String formType = formElement.getAttribute("type");
-        if (formType.isEmpty() || "single".equals(formType) || 
"upload".equals(formType)) {
+        if ("form".equals(formElement.getTagName()) && (formType.isEmpty() || 
"single".equals(formType) || "upload".equals(formType))) {
             return new ModelSingleForm(formElement, formLocation, 
entityModelReader, visualTheme, dispatchContext);
         }
         return new ModelGrid(formElement, formLocation, entityModelReader, 
visualTheme, dispatchContext);