jford 2004/09/30 11:40:00
Modified: applications/pam/src/java/org/apache/jetspeed/portlets/pam
PortletApplicationResources.java
applications/pam/src/webapp/WEB-INF/view site-detail.jsp
applications/pam/src/java/org/apache/jetspeed/portlets/site
SiteDetailPortlet.java
Log:
Keep tabs independant from other portlets
Revision Changes Path
1.11 +2 -1
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationResources.java
Index: PortletApplicationResources.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationResources.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PortletApplicationResources.java 20 Sep 2004 07:25:23 -0000 1.10
+++ PortletApplicationResources.java 30 Sep 2004 18:39:59 -0000 1.11
@@ -44,4 +44,5 @@
public final static String PAM_CURRENT_USER = "org.apache.jetspeed.pam.user";
public final static String REQUEST_SELECT_USER = "select_user";
public final static String PORTLET_ACTION = "portlet_action";
+ public static final String REQUEST_SELECT_SITE_TAB = "selected_site_tab";
}
1.9 +1 -1
jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/site-detail.jsp
Index: site-detail.jsp
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/webapp/WEB-INF/view/site-detail.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- site-detail.jsp 24 Sep 2004 22:21:15 -0000 1.8
+++ site-detail.jsp 30 Sep 2004 18:40:00 -0000 1.9
@@ -49,7 +49,7 @@
<div id="tabs">
<c:set var="tab_items" value="${requestScope.tabs}"/>
<c:set var="currentTab" value="${selectedTab}"/>
- <c:set var="url_param_name" value="selected_tab"/>
+ <c:set var="url_param_name" value="selected_site_tab"/>
<%@ include file="tabs.jsp"%>
</div>
1.6 +4 -4
jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteDetailPortlet.java
Index: SiteDetailPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/applications/pam/src/java/org/apache/jetspeed/portlets/site/SiteDetailPortlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SiteDetailPortlet.java 20 Sep 2004 16:37:14 -0000 1.5
+++ SiteDetailPortlet.java 30 Sep 2004 18:40:00 -0000 1.6
@@ -119,7 +119,7 @@
request.setAttribute("tabs", tabMap.values());
- TabBean selectedTab = (TabBean)
request.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_TAB,
PortletSession.APPLICATION_SCOPE);
+ TabBean selectedTab = (TabBean)
request.getPortletSession().getAttribute(PortletApplicationResources.REQUEST_SELECT_SITE_TAB,
PortletSession.APPLICATION_SCOPE);
if(selectedTab == null)
{
selectedTab = (TabBean) tabMap.values().iterator().next();
@@ -133,11 +133,11 @@
public void processAction(ActionRequest actionRequest, ActionResponse
actionResponse) throws PortletException, IOException
{
- String selectedTab =
actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_TAB);
+ String selectedTab =
actionRequest.getParameter(PortletApplicationResources.REQUEST_SELECT_SITE_TAB);
if(selectedTab != null)
{
TabBean tab = (TabBean) tabMap.get(selectedTab);
-
actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_TAB,
tab, PortletSession.APPLICATION_SCOPE);
+
actionRequest.getPortletSession().setAttribute(PortletApplicationResources.REQUEST_SELECT_SITE_TAB,
tab, PortletSession.APPLICATION_SCOPE);
}
String actionType = actionRequest.getParameter("action_type");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
