svn commit: r1742128 - in /ofbiz/branches/release15.12: ./ framework/widget/src/org/ofbiz/widget/model/FormFactory.java

Author: jleroux
Date: Tue May  3 15:26:35 2016
New Revision: 1742128

URL: http://svn.apache.org/viewvc?rev=1742128&view=rev
Log:
"Applied fix from trunk for revision: 1742126  "
------------------------------------------------------------------------
r1742126 | jleroux | 2016-05-03 17:25:48 +0200 (mar. 03 mai 2016) | 7 lignes

Fixes "Bug when getting to webtools/control/FindUtilCache"  - https://issues.apache.org/jira/browse/OFBIZ-7033

With OFBIZ-7029 I replaced some widget list forms by grids. I don't know why yet but there are some cases, like at webtools/control/FindUtilCache, where it crashes.

I mean I know why, but I don't know why yet it's not in all places. For instance accounting/control/ListFixedAssets has not this problem.

I'll later check what is the difference between both cases
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/FormFactory.java

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May  3 15:26:35 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742126

Modified: ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/FormFactory.java?rev=1742128&r1=1742127&r2=1742128&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/FormFactory.java (original)
+++ ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/FormFactory.java Tue May  3 15:26:35 2016
@@ -120,12 +120,16 @@ public class FormFactory {
 
     public static ModelForm createModelForm(Document formFileDoc, ModelReader entityModelReader, DispatchContext dispatchContext, String formLocation, String formName) {
         Element formElement = UtilXml.firstChildElement(formFileDoc.getDocumentElement(), "form", "name", formName);
+        if (formElement == null) {
+            formElement = UtilXml.firstChildElement(rootElement, "grid", "name", formName);
+        }
         return createModelForm(formElement, entityModelReader, dispatchContext, formLocation, formName);
     }
 
     public static ModelForm createModelForm(Element formElement, ModelReader entityModelReader, DispatchContext dispatchContext, String formLocation, String formName) {
         String formType = formElement.getAttribute("type");
-        if (formType.isEmpty() || "single".equals(formType) || "upload".equals(formType)) {
+        if ((formType.isEmpty() || "single".equals(formType) || "upload".equals(formType))
+                && !formElement.getLocalName().equals("grid")) {
             return new ModelSingleForm(formElement, formLocation, entityModelReader, dispatchContext);
         } else {
             return new ModelGrid(formElement, formLocation, entityModelReader, dispatchContext);