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/02/23 21:05:55 UTC
svn commit: r1661760 - in
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model: ModelGrid.java
ModelSingleForm.java
Author: adrianc
Date: Mon Feb 23 20:05:55 2015
New Revision: 1661760
URL: http://svn.apache.org/r1661760
Log:
Fixed a bug in form widget extends feature - https://issues.apache.org/jira/browse/OFBIZ-6084.
Modified:
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/ModelGrid.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/model/ModelGrid.java?rev=1661760&r1=1661759&r2=1661760&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 Feb 23 20:05:55 2015
@@ -64,7 +64,6 @@ public class ModelGrid extends ModelForm
ModelForm parentModel = null;
String parentResource = gridElement.getAttribute("extends-resource");
String parentGrid = gridElement.getAttribute("extends");
- String gridType = gridElement.getAttribute("type");
if (!parentGrid.isEmpty()) {
// check if we have a resource name
if (!parentResource.isEmpty()) {
@@ -83,8 +82,7 @@ public class ModelGrid extends ModelForm
gridElements = UtilXml.childElementList(rootElement, "form");
}
for (Element parentElement : gridElements) {
- if (parentElement.getAttribute("name").equals(parentGrid)
- && gridType.equals(parentElement.getAttribute("type"))) {
+ if (parentElement.getAttribute("name").equals(parentGrid)) {
parentModel = GridFactory.createModelGrid(parentElement, entityModelReader, dispatchContext,
parentResource, parentGrid);
break;
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=1661760&r1=1661759&r2=1661760&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 Feb 23 20:05:55 2015
@@ -65,7 +65,6 @@ public class ModelSingleForm extends Mod
ModelForm parent = null;
String parentResource = formElement.getAttribute("extends-resource");
String parentForm = formElement.getAttribute("extends");
- String formType = formElement.getAttribute("type");
if (!parentForm.isEmpty()) {
// check if we have a resource name
if (!parentResource.isEmpty()) {
@@ -82,8 +81,7 @@ public class ModelSingleForm extends Mod
//Uncomment below to add support for abstract forms
//formElements.addAll(UtilXml.childElementList(rootElement, "abstract-form"));
for (Element parentElement : formElements) {
- if (parentElement.getAttribute("name").equals(parentForm)
- && formType.equals(parentElement.getAttribute("type"))) {
+ if (parentElement.getAttribute("name").equals(parentForm)) {
parent = FormFactory.createModelForm(parentElement, entityModelReader, dispatchContext, parentResource,
parentForm);
break;