Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ofbiz.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1573500 - in /ofbiz/branches/release13.07: ./
 framework/widget/src/org/ofbiz/widget/form/ModelForm.java
Date: Mon, 03 Mar 2014 09:53:55 -0000
To: commits@ofbiz.apache.org
From: jleroux@apache.org
Message-Id: <20140303095355.B5A5F238899C@eris.apache.org>

Author: jleroux
Date: Mon Mar  3 09:53:55 2014
New Revision: 1573500

URL: http://svn.apache.org/r1573500
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/release13.07/   (props changed)
    ofbiz/branches/release13.07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1573498

Modified: ofbiz/branches/release13.07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=1573500&r1=1573499&r2=1573500&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/branches/release13.07/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Mon Mar  3 09:53:55 2014
@@ -1059,7 +1059,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());