taylor 2005/02/08 10:17:40
Modified: portals-bridges/common/src/java/org/apache/portals/bridges/common
GenericServletPortlet.java
Log:
allow override of edit and help page in request
Revision Changes Path
1.6 +21 -7
jakarta-jetspeed-2/portals-bridges/common/src/java/org/apache/portals/bridges/common/GenericServletPortlet.java
Index: GenericServletPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portals-bridges/common/src/java/org/apache/portals/bridges/common/GenericServletPortlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GenericServletPortlet.java 19 Jan 2005 09:49:45 -0000 1.5
+++ GenericServletPortlet.java 8 Feb 2005 18:17:40 -0000 1.6
@@ -260,12 +260,19 @@
throws PortletException, IOException
{
String editPage = this.defaultEditPage;
+
+ // allow EditPage override by the request
+ String reqEditPage = (String) request.getAttribute(PARAM_EDIT_PAGE);
+ if(reqEditPage != null)
+ {
+ editPage = reqEditPage;
+ }
+
if (this.allowPreferences == true)
{
PortletPreferences prefs = request.getPreferences();
- // Allow EditPage override by the request
- editPage = request.getParameter(PARAM_EDIT_PAGE);
- if (prefs != null && editPage == null)
+
+ if (prefs != null && reqEditPage == null)
{
editPage = prefs.getValue(PARAM_EDIT_PAGE,
this.defaultEditPage);
}
@@ -291,13 +298,20 @@
throws PortletException, IOException
{
String helpPage = this.defaultHelpPage;
+
+ // allow HelpPage override by the request
+ String reqHelpPage = (String) request.getAttribute(PARAM_HELP_PAGE);
+ if(reqHelpPage != null)
+ {
+ helpPage = reqHelpPage;
+ }
+
if (this.allowPreferences == true)
{
PortletPreferences prefs = request.getPreferences();
- // Allow HelpPage override by the request
- helpPage = request.getParameter(PARAM_EDIT_PAGE);
- if (prefs != null && helpPage == null)
+
+ if (prefs != null && reqHelpPage == null)
{
helpPage = prefs.getValue(PARAM_HELP_PAGE,
this.defaultHelpPage);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
