svn commit: r1751125 - /ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/ModelForm.java

[ashish-18]

Author: ashish
Date: Sun Jul  3 06:47:46 2016
New Revision: 1751125

URL: http://svn.apache.org/viewvc?rev=1751125&view=rev
Log:
Applied changes from trunk r1751124.
=======================================
Applied patch from jira issue - OFBIZ-7513 - alt-target tag is not working as expected in Form Widget.
Thanks Pritam for the contribution. Thanks Montalbano and Jacques for participating in discussion.

Modified:
    ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/ModelForm.java

Modified: ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/ModelForm.java?rev=1751125&r1=1751124&r2=1751125&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/ModelForm.java (original)
+++ ofbiz/branches/release15.12/framework/widget/src/org/ofbiz/widget/model/ModelForm.java Sun Jul  3 06:47:46 2016
@@ -378,12 +378,12 @@ public abstract class ModelForm extends
         }
         this.paginateTarget = paginateTarget;
         ArrayList<AltTarget> altTargets = new ArrayList<AltTarget>();
-        if (parentModel != null) {
-            altTargets.addAll(parentModel.altTargets);
-        }
         for (Element altTargetElement : UtilXml.childElementList(formElement, "alt-target")) {
             altTargets.add(new AltTarget(altTargetElement));
         }
+        if (parentModel != null) {
+            altTargets.addAll(parentModel.altTargets);
+        }
         altTargets.trimToSize();
         this.altTargets = Collections.unmodifiableList(altTargets);
         ArrayList<ModelAction> actions = new ArrayList<ModelAction>();