Revision: 1392
http://stripes.svn.sourceforge.net/stripes/?rev=1392&view=rev
Author: bengunter
Date: 2011-02-03 17:02:23 +0000 (Thu, 03 Feb 2011)
Log Message:
-----------
STS-788: Fixed incorrect handling of dynamic attributes on stripes:render tags,
as described by David Dundua in his comments on STS-788 on Jan. 11, 2011.
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutContext.java
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutContext.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutContext.java
2011-01-06 18:11:46 UTC (rev 1391)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutContext.java
2011-02-03 17:02:23 UTC (rev 1392)
@@ -20,6 +20,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import javax.servlet.ServletException;
import javax.servlet.jsp.PageContext;
@@ -76,6 +77,13 @@
if (context == null) {
context = (LayoutContext)
pageContext.getRequest().getAttribute(LAYOUT_CONTEXT_KEY);
if (context != null) {
+ for (LayoutContext c = context.getFirst(); c != context; c =
c.getNext()) {
+ for (Entry<String, Object> entry :
c.getParameters().entrySet()) {
+ pageContext.setAttribute(entry.getKey(),
entry.getValue(),
+ PageContext.PAGE_SCOPE);
+ }
+ }
+
pageContext.setAttribute(LAYOUT_CONTEXT_KEY, context);
pageContext.getRequest().removeAttribute(LAYOUT_CONTEXT_KEY);
}
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
2011-01-06 18:11:46 UTC (rev 1391)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/tag/layout/LayoutDefinitionTag.java
2011-02-03 17:02:23 UTC (rev 1392)
@@ -71,8 +71,10 @@
context.setRendered(true);
// Put any additional parameters into page context for the definition
to use
- for (Map.Entry<String, Object> entry :
context.getParameters().entrySet()) {
- pageContext.setAttribute(entry.getKey(), entry.getValue());
+ if (!renderPhase) {
+ for (Map.Entry<String, Object> entry :
context.getParameters().entrySet()) {
+ pageContext.setAttribute(entry.getKey(), entry.getValue());
+ }
}
// Put component renderers into the page context, even those from
previous contexts
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
