portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jf...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers PanedControllerAction.java
Date Mon, 27 Oct 2003 03:55:31 GMT
jford       2003/10/26 19:55:31

  Modified:    src/java/org/apache/jetspeed/portal/controllers
                        VelocityPanedPortletController.java
               src/java/org/apache/jetspeed/modules/actions/controllers
                        PanedControllerAction.java
  Log:
  Change to only save the pane id if the pane is not "closed".
  
  PR: Bugzilla #18291
  
  Revision  Changes    Path
  1.12      +11 -6     jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java
  
  Index: VelocityPanedPortletController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- VelocityPanedPortletController.java	23 Jul 2003 19:50:16 -0000	1.11
  +++ VelocityPanedPortletController.java	27 Oct 2003 03:55:31 -0000	1.12
  @@ -164,8 +164,10 @@
                 // change the currently selected pane in the user session
                 // If this is not done, the tab selection works, but the
                 // content is picked up from the pane in the session!!
  -              SessionState state = ((JetspeedRunData)rundata).getPortletSessionState(getPortlets().getID());
  -              state.setAttribute(JetspeedResources.PATH_PANEID_KEY, subPane);
  +              if(!p.getAttribute("_menustate", "open", rundata).equals("closed")) {
  +                  SessionState state = ((JetspeedRunData)rundata).getPortletSessionState(getPortlets().getID());
  +                  state.setAttribute(JetspeedResources.PATH_PANEID_KEY, subPane);   
  +              }
   
                 return true;
               }
  @@ -194,9 +196,12 @@
                       // change the currently selected pane in the user session
                       // If this is not done, the tab selection works, but the
                       // content is picked up from the pane in the session!!
  -                    SessionState state = 
  -                        ((JetspeedRunData)rundata).getPortletSessionState(getPortlets().getID());
  -                    state.setAttribute(JetspeedResources.PATH_PANEID_KEY, subPane);
  +                    if(!p.getAttribute("_menustate", "open", rundata).equals("closed"))
  +                    {
  +                        SessionState state = 
  +                            ((JetspeedRunData)rundata).getPortletSessionState(getPortlets().getID());
  +                        state.setAttribute(JetspeedResources.PATH_PANEID_KEY, subPane);
  +                    }
                       return true;
                   }
               }
  
  
  
  1.10      +6 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/PanedControllerAction.java
  
  Index: PanedControllerAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controllers/PanedControllerAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PanedControllerAction.java	4 Mar 2003 00:04:53 -0000	1.9
  +++ PanedControllerAction.java	27 Oct 2003 03:55:31 -0000	1.10
  @@ -121,7 +121,11 @@
   
           if (portlet != null)
               context.put("pane", portlet);        
  -        cont.savePaneID(rundata, paneID);
  +        
  +        if(!portlet.getAttribute("_menustate", "open", rundata).equals("closed"))
  +        {   
  +            cont.savePaneID(rundata, paneID);
  +        }
       }    
   
   }
  
  
  

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


Mime
View raw message