Author: julien(a)jboss.com
Date: 2007-01-20 20:48:01 -0500 (Sat, 20 Jan 2007)
New Revision: 6059
Modified:
trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp
Log:
- fix the no propagation of current page when a cms/portlet editor was chosen causing to
go back on default page when another page was selected
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2007-01-21
01:18:15 UTC (rev 6058)
+++
trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2007-01-21
01:48:01 UTC (rev 6059)
@@ -112,6 +112,12 @@
op = "editPage";
}
+ String contentType = req.getParameter("contentType");
+ if (contentType == null)
+ {
+ contentType = "portlet";
+ }
+
String errorMessage = req.getParameter("errorMsg");
// load portal + page for editting.
@@ -188,6 +194,7 @@
req.setAttribute("currentLayout",
currentLayout.getLayoutInfo().getName());
req.setAttribute("currentTheme", currentTheme.getThemeInfo().getName());
req.setAttribute("themes", themes);
+ req.setAttribute("contentType", contentType);
if (errorMessage != null)
{
req.setAttribute("errorMsg", errorMessage);
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-21
01:18:15 UTC (rev 6058)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-21
01:48:01 UTC (rev 6059)
@@ -34,7 +34,7 @@
Collection layouts = (Collection)request.getAttribute("layouts");
Collection themes = (Collection)request.getAttribute("themes");
- String contentType = request.getParameter("contentType");
+ String contentType = (String)request.getAttribute("contentType");
%>
<script type="text/javascript" language="JavaScript">
@@ -156,14 +156,7 @@
<input type="hidden" name="toRegion" value=""/>
<input type="hidden" name="fromRegion" value=""/>
<input type="hidden" name="sortRegion" value=""/>
-<%
- if (contentType != null)
- {
-%>
<input type="hidden" name="contentType" value="<%=
contentType %>"/>
-<%
- }
-%>
<input type="hidden" name="editPageSelect" value="<%=
currentPage %>"/>
<table width="100%">
<tr>
@@ -241,7 +234,9 @@
{
ContentType ct = (ContentType)i.next();
%>
- <a href="<portlet:renderURL><portlet:param name="op"
value="editPage"/><portlet:param name="contentType"
value="<%= ct.toString() %>"/>
+ <a href="<portlet:renderURL><portlet:param name="op"
value="editPage"/>
+ <portlet:param name="contentType" value="<%= ct.toString()
%>"/>
+ <portlet:param name="editPageSelect" value="<%= currentPage
%>"/>
</portlet:renderURL>"><%= ct %></a>
<%
}
Show replies by date