cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security UserBrowserAction.java

[jford]

jford       2003/11/21 20:13:46

  Modified:    src/java/org/apache/jetspeed/modules/actions/portlets/security
                        UserBrowserAction.java
  Log:
  Add pane to link to fix portlet flow
  
  PR:  Bugzilla #24536
  Submitted by: Joachim Mueller
  
  Revision  Changes    Path
  1.13      +10 -2     
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java
  
  Index: UserBrowserAction.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserBrowserAction.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- UserBrowserAction.java    13 Aug 2003 04:18:17 -0000      1.12
  +++ UserBrowserAction.java    22 Nov 2003 04:13:46 -0000      1.13
  @@ -68,6 +68,7 @@
   import org.apache.jetspeed.services.logging.JetspeedLogger;
   import org.apache.jetspeed.services.security.JetspeedSecurityException;
   import org.apache.jetspeed.services.resources.JetspeedResources;
  +import org.apache.jetspeed.util.template.JetspeedLink;
   import org.apache.jetspeed.om.security.JetspeedUser;
   
   // jetspeed velocity
  @@ -252,7 +253,14 @@
                       }
                       else
                       {
  -                    pageLinks.append("[ <a href=./portal/"+DISPLAY_PAGE+"/" + i + 
">" + i + "</a> ] &nbsp;");
  +//                                           make sure the page navigation always 
points to 
  +//                                           the right pane
  +                                             Object jslink = context.get("jslink");
  +                                             if (jslink instanceof JetspeedLink) {
  +                                              pageLinks.append("[ <a href=\"" + 
((JetspeedLink)jslink).getPaneByName("UserBrowser").addQueryData(DISPLAY_PAGE, new 
Integer(i)).toString() + "\">" + i + "</a> ] &nbsp;");
  +                                             } else {
  +                                              pageLinks.append("[ <a 
href=\"./portal/" + DISPLAY_PAGE + "/" + i + "\">" + i + "</a> ] &nbsp;");
  +                                             }
                       }
                   }
                   context.put("pagelinks", pageLinks);
  
  
  

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