You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/14 21:35:12 UTC
svn commit: r422001 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui:
core/tags/menu/BaseRollerMenu.java rendering/servlets/PageServlet.java
rendering/servlets/PreviewServlet.java
Author: agilliland
Date: Fri Jul 14 12:35:11 2006
New Revision: 422001
URL: http://svn.apache.org/viewvc?rev=422001&view=rev
Log:
special hack for menu tag. we are setting the parsed page request as an http request attribute in cases where the menu tag is used so that the menu tag can get access to the parsed request. this will need to be fixed in a better fashion at some point in the future.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java?rev=422001&r1=422000&r2=422001&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/tags/menu/BaseRollerMenu.java Fri Jul 14 12:35:11 2006
@@ -213,6 +213,10 @@
* the selected weblog.
*
* TODO 3.0: more simple/consistent method for conveying weblog state across requests
+ *
+ * NOTE: even better would be to separate this into 2 versions, one for
+ * the authoring/admin UI and one for rendering. it doesn't make
+ * sense for this strange intermixing to be happening.
*/
protected static WebsiteData getRequestedWeblog(HttpServletRequest request) throws RollerException {
WebsiteData weblog = null;
@@ -241,8 +245,11 @@
weblog = roller.getUserManager().getWebsiteByHandle(handle);
} else {
// check rendering system form of URL
- WeblogPageRequest pageRequest = new WeblogPageRequest(request);
- weblog = pageRequest.getWeblog();
+ // TODO: hack. we expect the parsed request as an HttpRequest attr
+ WeblogPageRequest pageRequest = (WeblogPageRequest) request.getAttribute("pageRequest");
+ if(pageRequest != null) {
+ weblog = pageRequest.getWeblog();
+ }
}
return weblog;
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java?rev=422001&r1=422000&r2=422001&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java Fri Jul 14 12:35:11 2006
@@ -275,6 +275,9 @@
PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(
this, request, response,"", true, 8192, true);
+ // special hack for menu tag
+ request.setAttribute("pageRequest", pageRequest);
+
// populate the rendering model
Map initData = new HashMap();
initData.put("request", request);
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java?rev=422001&r1=422000&r2=422001&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PreviewServlet.java Fri Jul 14 12:35:11 2006
@@ -134,15 +134,16 @@
Map model = new HashMap();
try {
RollerContext rollerContext = RollerContext.getRollerContext();
+ PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(
+ this, request, response,"", true, 8192, true);
+
+ // special hack for menu tag
+ request.setAttribute("pageRequest", previewRequest);
// populate the rendering model
Map initData = new HashMap();
initData.put("request", request);
initData.put("pageRequest", previewRequest);
-
- // page context for helpers which use jsp tags :/
- PageContext pageContext = JspFactory.getDefaultFactory().getPageContext(
- this, request, response,"", true, 8192, true);
initData.put("pageContext", pageContext);
// standard weblog models