cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/parameters/html MyPagesListBox.vm

[mo...@apache.org]

morciuch    2003/10/13 12:47:21

  Modified:    .        README
               src/java/org/apache/jetspeed/modules/parameters
                        MyPagesListBox.java
               webapp/WEB-INF/templates/vm/parameters/html
                        MyPagesListBox.vm
  Log:
  Fixed the portlet customizer problems with skin and security ref not taking effect until logout (see Bugzilla bug# 23521).
  
  Revision  Changes    Path
  1.24      +2 -1      jakarta-jetspeed/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/README,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- README	5 Sep 2003 16:41:16 -0000	1.23
  +++ README	13 Oct 2003 19:47:21 -0000	1.24
  @@ -301,7 +301,8 @@
   * New Features *
   
   	- Logging converted from Turbine to Commons. Contributed by Harald Ommang
  -	- WebClippingPortlet contributed by Marco Mari.
  +	- WebClippingPortlet. Contributed by Marco Mari.
  +	- MyPages functionality.
   
   ==============================================
   Jetspeed 1.4b4 was released on April 25, 2003.
  
  
  
  1.4       +11 -6     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/MyPagesListBox.java
  
  Index: MyPagesListBox.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/parameters/MyPagesListBox.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MyPagesListBox.java	23 Jul 2003 19:50:14 -0000	1.3
  +++ MyPagesListBox.java	13 Oct 2003 19:47:21 -0000	1.4
  @@ -55,7 +55,7 @@
    */
   
   // Java stuff
  -import java.util.ArrayList;
  +import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.Map;
   
  @@ -100,11 +100,11 @@
        */
       public void buildContext(RunData rundata, String name, String value, Map parms, Context context)
       {
  -        ArrayList entries = null;
  +        Map entries = null;
   
           try
           {
  -            entries = (ArrayList) rundata.getUser().getTemp(PsmlManagerAction.CACHED_PSML);
  +            entries = (Map) rundata.getUser().getTemp(PsmlManagerAction.CACHED_PSML);
               if (entries == null)
               {            
                   // Initialize the query locator
  @@ -113,7 +113,7 @@
                   JetspeedRunData jdata = (JetspeedRunData) rundata;
                   ql.setUser(jdata.getJetspeedUser());
                   //ql.setMediaType(jdata.getCapability().getPreferredMediaType());
  -                entries = new ArrayList();
  +                entries = new Hashtable();
                   Iterator i = Profiler.query(ql);
                   while (i.hasNext())
                   {
  @@ -128,7 +128,12 @@
                               {
                                   logger.debug("MyPagesListBox: refreshing user profile list: " + profile.getPath());
                               }
  -                            entries.add(profile);                
  +                            String title = profile.getName();
  +                            if (profile.getRootSet() != null && profile.getRootSet().getTitle() != null)
  +                            {
  +                                title = profile.getRootSet().getTitle();
  +                            }
  +                            entries.put(profile, title);                
                           }
                       }
                   }
  
  
  
  1.4       +5 -4      jakarta-jetspeed/webapp/WEB-INF/templates/vm/parameters/html/MyPagesListBox.vm
  
  Index: MyPagesListBox.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/parameters/html/MyPagesListBox.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MyPagesListBox.vm	19 Jun 2003 19:19:32 -0000	1.3
  +++ MyPagesListBox.vm	13 Oct 2003 19:47:21 -0000	1.4
  @@ -3,9 +3,10 @@
           $!disabled 
           #foreach($event in $events.keySet()) $event="$events.get($event)" #end 
           onchange="location.href=this.options[this.selectedIndex].value">
  -  <!--option value="$!defaultEntry">-- Default --</OPTION-->
     <OPTION VALUE="$jslink.setRole("user","psml-manager")">-- $l10n.PSML_MANAGER_MANAGE_PAGES --</OPTION>
  -#foreach ($entry in $pages)
  +#foreach ($entry in $pages.keySet())
  +
  +    #set ($title = $pages.get($entry))
   
       #if($!entry.GroupName)
           #set ($category = "Group")
  @@ -51,7 +52,7 @@
       #end
   
     <option value="$link1" #if ($link1.toString().equals($jslink.toString())) SELECTED #end>
  -  #if ($entry.RootSet.Title) $entry.RootSet.Title #else $entry.Name #end &nbsp;&nbsp;
  +    $title &nbsp;&nbsp;
     </OPTION>
   #end
   </select>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org