You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2015/01/26 15:58:44 UTC
svn commit: r1654824 - in
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model: ModelForm.java
ModelGrid.java ModelSingleForm.java
Author: adrianc
Date: Mon Jan 26 14:58:43 2015
New Revision: 1654824
URL: http://svn.apache.org/r1654824
Log:
Fixed a bug in the form widget models where a default type was not being supplied under certain circumstances - https://issues.apache.org/jira/browse/OFBIZ-6037.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java?rev=1654824&r1=1654823&r2=1654824&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelForm.java Mon Jan 26 14:58:43 2015
@@ -194,7 +194,7 @@ public abstract class ModelForm extends
private final Set<String> useWhenFields;
/** XML Constructor */
- protected ModelForm(Element formElement, String formLocation, ModelReader entityModelReader, DispatchContext dispatchContext) {
+ protected ModelForm(Element formElement, String formLocation, ModelReader entityModelReader, DispatchContext dispatchContext, String defaultType) {
super(formElement);
this.formLocation = formLocation;
parentModel = getParentModel(formElement, entityModelReader, dispatchContext);
@@ -215,8 +215,12 @@ public abstract class ModelForm extends
}
this.defaultViewSize = defaultViewSizeInt;
String type = formElement.getAttribute("type");
- if (type.isEmpty() && parentModel != null) {
- type = parentModel.type;
+ if (type.isEmpty()) {
+ if (parentModel != null) {
+ type = parentModel.type;
+ } else {
+ type = defaultType;
+ }
}
this.type = type;
FlexibleStringExpander target = FlexibleStringExpander.getInstance(formElement.getAttribute("target"));
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java?rev=1654824&r1=1654823&r2=1654824&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java Mon Jan 26 14:58:43 2015
@@ -52,7 +52,7 @@ public class ModelGrid extends ModelForm
/** XML Constructor */
public ModelGrid(Element formElement, String formLocation, ModelReader entityModelReader, DispatchContext dispatchContext) {
- super(formElement, formLocation, entityModelReader, dispatchContext);
+ super(formElement, formLocation, entityModelReader, dispatchContext, "list");
}
@Override
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java?rev=1654824&r1=1654823&r2=1654824&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelSingleForm.java Mon Jan 26 14:58:43 2015
@@ -53,7 +53,7 @@ public class ModelSingleForm extends Mod
/** XML Constructor */
public ModelSingleForm(Element formElement, String formLocation, ModelReader entityModelReader,
DispatchContext dispatchContext) {
- super(formElement, formLocation, entityModelReader, dispatchContext);
+ super(formElement, formLocation, entityModelReader, dispatchContext, "single");
}
@Override