You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/07/28 20:34:17 UTC
svn commit: r426640 - in /incubator/roller/branches/roller_3.0:
src/org/apache/roller/ui/rendering/model/PageModel.java
src/org/apache/roller/ui/rendering/servlets/PageServlet.java
web/WEB-INF/velocity/site.vm
Author: snoopdave
Date: Fri Jul 28 11:34:17 2006
New Revision: 426640
URL: http://svn.apache.org/viewvc?rev=426640&view=rev
Log:
Added request params to new PageModel
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/servlets/PageServlet.java
incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java?rev=426640&r1=426639&r2=426640&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java Fri Jul 28 11:34:17 2006
@@ -46,7 +46,7 @@
private WeblogPageRequest pageRequest = null;
private WeblogEntryCommentForm commentForm = null;
-
+ private Map requestParameters = null;
private WebsiteData weblog = null;
@@ -79,6 +79,8 @@
// see if there is a comment form
this.commentForm = (WeblogEntryCommentForm) initData.get("commentForm");
+ this.requestParameters = (Map)initData.get("requestParameters");
+
// extract weblog object
weblog = pageRequest.getWeblog();
}
@@ -200,4 +202,14 @@
return commentForm;
}
+ /**
+ * Get request parameter by name.
+ */
+ public String getRequestParameter(String paramName) {
+ String[] values = (String[])requestParameters.get(paramName);
+ if (values != null && values.length > 0) {
+ return values[0];
+ }
+ return null;
+ }
}
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=426640&r1=426639&r2=426640&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 28 11:34:17 2006
@@ -323,6 +323,7 @@
// populate the rendering model
Map initData = new HashMap();
initData.put("request", request);
+ initData.put("requestParameters", request.getParameterMap());
initData.put("pageRequest", pageRequest);
initData.put("weblogRequest", pageRequest);
initData.put("pageContext", pageContext);
Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm?rev=426640&r1=426639&r2=426640&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/velocity/site.vm Fri Jul 28 11:34:17 2006
@@ -147,8 +147,8 @@
##-----------------------------------------------------------------------------
#macro(showWeblogDirectory $pageLength)
- #if($pageModel.getRequestParameter("letter"))
- #set($chosenLetter = $pageModel.getRequestParameter("letter"))
+ #if($model.getRequestParameter("letter"))
+ #set($chosenLetter = $model.getRequestParameter("letter"))
#else
#set($chosenLetter = "A")
#end
@@ -268,8 +268,8 @@
##-----------------------------------------------------------------------------
#macro(showUserDirectory $pageLength)
- #if($pageModel.getRequestParameter("letter"))
- #set($chosenLetter = $pageModel.getRequestParameter("letter"))
+ #if($model.getRequestParameter("letter"))
+ #set($chosenLetter = $model.getRequestParameter("letter"))
#else
#set($chosenLetter = "A")
#end