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 2014/03/03 10:54:04 UTC
svn commit: r1573502 - in /ofbiz/branches/release11.04: ./
framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Author: jleroux
Date: Mon Mar 3 09:54:04 2014
New Revision: 1573502
URL: http://svn.apache.org/r1573502
Log:
"Applied fix from trunk for revision: 1573498 "
------------------------------------------------------------------------
r1573498 | jleroux | 2014-03-03 10:49:34 +0100 (lun. 03 mars 2014) | 3 lignes
Revert r1573161 (A patch from Leila Mekika for "Problems in single form when use-when and position are used together" https://issues.apache.org/jira/browse/OFBIZ-5552)
This had some side effects, like hiding the top part of the product edit screen
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1573498
Modified: ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1573502&r1=1573501&r2=1573502&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/release11.04/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Mar 3 09:54:04 2014
@@ -999,7 +999,6 @@ public class ModelForm extends ModelWidg
}
//Debug.logInfo("In single form evaluating use-when for field " + currentFormField.getName() + ": " + currentFormField.getUseWhen(), module);
if (!currentFormField.shouldUse(context)) {
- currentFormField = lastFormField;
continue;
}
alreadyRendered.add(currentFormField.getName());