cvs commit: jakarta-jetspeed-2/portals-bridges/common/src/java/org/apache/portals/bridges/common GenericServletPortlet.java

[ate]

ate         2005/01/19 01:49:45

  Modified:    portals-bridges/common/src/java/org/apache/portals/bridges/common
                        GenericServletPortlet.java
  Log:
  Path supplied by Christophe Lombart: 
http://issues.apache.org/jira/browse/JS2-195
  
  Revision  Changes    Path
  1.5       +9 -4      
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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GenericServletPortlet.java        15 Nov 2004 05:58:32 -0000      1.4
  +++ GenericServletPortlet.java        19 Jan 2005 09:49:45 -0000      1.5
  @@ -261,9 +261,11 @@
       {
           String editPage = this.defaultEditPage;
           if (this.allowPreferences == true)
  -        {
  +        {                       
               PortletPreferences prefs = request.getPreferences();
  -            if (prefs != null)
  +            // Allow EditPage override by the request
  +            editPage = request.getParameter(PARAM_EDIT_PAGE);
  +            if (prefs != null && editPage == null)
               {
                   editPage = prefs.getValue(PARAM_EDIT_PAGE, 
this.defaultEditPage);
               }
  @@ -291,8 +293,11 @@
           String helpPage = this.defaultHelpPage;
           if (this.allowPreferences == true)
           {
  +
               PortletPreferences prefs = request.getPreferences();
  -            if (prefs != null)
  +            // Allow HelpPage override by the request
  +            helpPage = request.getParameter(PARAM_EDIT_PAGE);
  +            if (prefs != null && helpPage == null)
               {
                   helpPage = prefs.getValue(PARAM_HELP_PAGE, 
this.defaultHelpPage);
               }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]