Author: hqm
Date: 2007-07-20 15:03:44 -0700 (Fri, 20 Jul 2007)
New Revision: 5735
Modified:
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
Log:
Change 20070720-hqm-2 by [EMAIL PROTECTED] on 2007-07-20 16:56:27 EDT
in /cygdrive/c/users/hqm/openlaszlo/legals4/WEB-INF/lps/server/src
for
http://svn.openlaszlo.org/openlaszlo/branches/legals/WEB-INF/lps/server/src
Summary: datapath attribute was conflicting with <datapath> element
New Features:
Bugs Fixed: LPP-3482, LPP-3894
Technical Reviewer: ptw (pending)
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
This was a regression from LPP_3894. There was a fix which made sure to
ignore inherited datapath attributes when there was a <datapath> child node
found. That fix was inside of LzFixTags, which later was removed completely.
Fix moved the proper line of code to the compiler.
Tests:
testcase in bug report
Modified:
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
===================================================================
---
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
2007-07-20 20:59:31 UTC (rev 5734)
+++
openlaszlo/branches/legals/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
2007-07-20 22:03:44 UTC (rev 5735)
@@ -1574,6 +1574,11 @@
}
if (datapath != null) {
attrs.put("$datapath", datapath.asMap());
+ // If we've got an explicit datapath value, we have to
+ // null out the "datapath" attribute with the magic
+ // LzNode._ignoreAttribute value, so it doesn't get
+ // overridden by an inherited value from the class.
+ attrs.put("datapath", "LzNode._ignoreAttribute");
}
if (!styles.isEmpty()) {
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
