svn commit: r639488 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java

[jacopoc]

Author: jacopoc
Date: Thu Mar 20 15:32:51 2008
New Revision: 639488

URL: http://svn.apache.org/viewvc?rev=639488&view=rev
Log:
Fix to properly populate artifact info for forms that extend other form in the same file.

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java

Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java?rev=639488&r1=639487&r2=639488&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelForm.java Thu Mar 20 15:32:51 2008
@@ -234,7 +234,6 @@
                     Debug.logError("Failed to find parent form definition '" + parentForm + "' in same document.", module);
                 } else {
                     this.parentFormName = parentForm;
-                    this.parentFormLocation = this.formLocation;
                 }
             } else {
                 Debug.logError("Recursive form definition found for '" + formElement.getAttribute("name") + ".'", module);
@@ -1718,6 +1717,9 @@
     }
 
     public String getParentFormLocation() {
+        if (this.parentFormName != null && this.parentFormLocation == null) {
+            return this.formLocation;
+        }
         return this.parentFormLocation;
     }