You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by si...@apache.org on 2006/12/15 21:54:00 UTC
svn commit: r487657 -
/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Author: sichen
Date: Fri Dec 15 12:53:59 2006
New Revision: 487657
URL: http://svn.apache.org/viewvc?view=rev&rev=487657
Log:
Reverting SVN r 486834. This caused a bug on certain types of forms where a column which should be there was not displayed properly.
Modified:
incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?view=diff&rev=487657&r1=487656&r2=487657
==============================================================================
--- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Fri Dec 15 12:53:59 2006
@@ -100,8 +100,7 @@
protected boolean skipEnd = false;
protected boolean hideHeader = false;
protected boolean overridenListSize = false;
- protected boolean listEnd = false;
-
+
protected List altTargets = new LinkedList();
protected List autoFieldsServices = new LinkedList();
protected List autoFieldsEntities = new LinkedList();
@@ -998,11 +997,7 @@
//Modification Nicolas
previousModelFormField = modelFormField;
}
-
- if (!displayHyperlinkFieldIter.hasNext()) {
- listEnd = true;
- }
-
+
List headerFormFields = new LinkedList();
Iterator formFieldIter = this.fieldList.iterator();
//boolean isFirstFormHeader = true;
@@ -1028,9 +1023,7 @@
}
// render the "form" cell
- if (!listEnd) {
- formStringRenderer.renderFormatHeaderRowFormCellOpen(buffer, context, this);
- }
+ formStringRenderer.renderFormatHeaderRowFormCellOpen(buffer, context, this);
Iterator headerFormFieldIter = headerFormFields.iterator();
while (headerFormFieldIter.hasNext()) {
@@ -1053,9 +1046,7 @@
}
}
- if (!listEnd) {
- formStringRenderer.renderFormatHeaderRowFormCellClose(buffer, context, this);
- }
+ formStringRenderer.renderFormatHeaderRowFormCellClose(buffer, context, this);
// render the rest of the display/hyperlink fields
while (displayHyperlinkFieldIter.hasNext()) {
@@ -1214,9 +1205,7 @@
}
// render the "form" cell
- if (!listEnd) {
- formStringRenderer.renderFormatItemRowFormCellOpen(buffer, localContext, this);
- }
+ formStringRenderer.renderFormatItemRowFormCellOpen(buffer, localContext, this);
if (formPerItem) {
formStringRenderer.renderFormOpen(buffer, localContext, this);
@@ -1257,9 +1246,7 @@
formStringRenderer.renderFormClose(buffer, localContext, this);
}
- if (!listEnd) {
- formStringRenderer.renderFormatItemRowFormCellClose(buffer, localContext, this);
- }
+ formStringRenderer.renderFormatItemRowFormCellClose(buffer, localContext, this);
// render the rest of the display/hyperlink fields
while (innerDisplayHyperlinkFieldIter.hasNext()) {
Re: svn commit: r487657 - /incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Posted by David E Jones <jo...@undersunconsulting.com>.
Thanks for looking into that Si. It's been on my list for the last
few days (since it went in) as a dangerous commit that needed review
and I have no problem with pulling it until it is better reviewed and
tested and fixed to not cause other problems...
I have reopened the Jira issue:
https://issues.apache.org/jira/browse/OFBIZ-542
-David
On Dec 15, 2006, at 1:54 PM, sichen@apache.org wrote:
> Author: sichen
> Date: Fri Dec 15 12:53:59 2006
> New Revision: 487657
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=487657
> Log:
> Reverting SVN r 486834. This caused a bug on certain types of
> forms where a column which should be there was not displayed properly.
>
> Modified:
> incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/
> form/ModelForm.java
>
> Modified: incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/
> widget/form/ModelForm.java
> URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/
> widget/src/org/ofbiz/widget/form/ModelForm.java?
> view=diff&rev=487657&r1=487656&r2=487657
> ======================================================================
> ========
> --- incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/
> form/ModelForm.java (original)
> +++ incubator/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/
> form/ModelForm.java Fri Dec 15 12:53:59 2006
> @@ -100,8 +100,7 @@
> protected boolean skipEnd = false;
> protected boolean hideHeader = false;
> protected boolean overridenListSize = false;
> - protected boolean listEnd = false;
> -
> +
> protected List altTargets = new LinkedList();
> protected List autoFieldsServices = new LinkedList();
> protected List autoFieldsEntities = new LinkedList();
> @@ -998,11 +997,7 @@
> //Modification Nicolas
> previousModelFormField = modelFormField;
> }
> -
> - if (!displayHyperlinkFieldIter.hasNext()) {
> - listEnd = true;
> - }
> -
> +
> List headerFormFields = new LinkedList();
> Iterator formFieldIter = this.fieldList.iterator();
> //boolean isFirstFormHeader = true;
> @@ -1028,9 +1023,7 @@
> }
>
> // render the "form" cell
> - if (!listEnd) {
> - formStringRenderer.renderFormatHeaderRowFormCellOpen
> (buffer, context, this);
> - }
> + formStringRenderer.renderFormatHeaderRowFormCellOpen
> (buffer, context, this);
>
> Iterator headerFormFieldIter = headerFormFields.iterator();
> while (headerFormFieldIter.hasNext()) {
> @@ -1053,9 +1046,7 @@
> }
> }
>
> - if (!listEnd) {
> - formStringRenderer.renderFormatHeaderRowFormCellClose
> (buffer, context, this);
> - }
> + formStringRenderer.renderFormatHeaderRowFormCellClose
> (buffer, context, this);
>
> // render the rest of the display/hyperlink fields
> while (displayHyperlinkFieldIter.hasNext()) {
> @@ -1214,9 +1205,7 @@
> }
>
> // render the "form" cell
> - if (!listEnd) {
> -
> formStringRenderer.renderFormatItemRowFormCellOpen(buffer,
> localContext, this);
> - }
> + formStringRenderer.renderFormatItemRowFormCellOpen
> (buffer, localContext, this);
>
> if (formPerItem) {
> formStringRenderer.renderFormOpen(buffer,
> localContext, this);
> @@ -1257,9 +1246,7 @@
> formStringRenderer.renderFormClose(buffer,
> localContext, this);
> }
>
> - if (!listEnd) {
> -
> formStringRenderer.renderFormatItemRowFormCellClose(buffer,
> localContext, this);
> - }
> + formStringRenderer.renderFormatItemRowFormCellClose
> (buffer, localContext, this);
>
> // render the rest of the display/hyperlink fields
> while (innerDisplayHyperlinkFieldIter.hasNext()) {
>
>