You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/05/03 22:41:48 UTC
svn commit: r1742195 -
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
Author: jleroux
Date: Tue May 3 20:41:48 2016
New Revision: 1742195
URL: http://svn.apache.org/viewvc?rev=1742195&view=rev
Log:
Reverts useless changes introduced with r1742126 for INVALID "Bug when getting to webtools/control/FindUtilCache" - https://issues.apache.org/jira/browse/OFBIZ-7033
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FormFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FormFactory.java?rev=1742195&r1=1742194&r2=1742195&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FormFactory.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/FormFactory.java Tue May 3 20:41:48 2016
@@ -127,16 +127,12 @@ public class FormFactory {
rootElement = UtilXml.firstChildElement(rootElement, "forms");
}
Element formElement = UtilXml.firstChildElement(rootElement, "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))
- && !formElement.getLocalName().equals("grid")) {
+ if (formType.isEmpty() || "single".equals(formType) || "upload".equals(formType)) {
return new ModelSingleForm(formElement, formLocation, entityModelReader, dispatchContext);
} else {
return new ModelGrid(formElement, formLocation, entityModelReader, dispatchContext);