Fixed issue where include-form tag failed when referencing a grid

(OFBIZ-13290)

Author: dixitdeepak

framework/widget/src/main/java/org/apache/ofbiz/widget/model/FormFactory.java

@@ -146,13 +146,20 @@ public static ModelForm createModelForm(Document formFileDoc, ModelReader entity
             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);