[portal-commits] JBoss Portal SVN: r6038 - in trunk/core/src/resources: portal-core-war/WEB-INF/jsp/dashboard and 1 other directory.
Author: julien(a)jboss.com
Date: 2007-01-18 17:03:00 -0500 (Thu, 18 Jan 2007)
New Revision: 6038
Modified:
trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp
Log:
fixed dashboard portlet content handling
Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-18
20:23:54 UTC (rev 6037)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-18
22:03:00 UTC (rev 6038)
@@ -553,6 +553,9 @@
<depends
optional-attribute-name="Registry"
proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends
+ optional-attribute-name="InstanceContainer"
+ proxy-type="attribute">portal:container=Instance</depends>
<attribute name="ContentType">portlet</attribute>
</mbean>
<mbean
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-18
20:23:54 UTC (rev 6037)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2007-01-18
22:03:00 UTC (rev 6038)
@@ -8,6 +8,8 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.TreeSet" %>
+<%@ page import="org.jboss.portal.core.model.content.ContentType" %>
+<%@ page
import="org.jboss.portal.core.impl.model.content.portlet.PortletContent" %>
<%@ page language="java"
extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"
%>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
@@ -253,10 +255,15 @@
for (Iterator j = windows.iterator(); j.hasNext();)
{
Window window = (Window)j.next();
+ ContentType contentType = window.getContentType();
+ if (ContentType.PORTLET.equals(contentType))
+ {
+ PortletContent portletContent =
(PortletContent)window.getContent();
%>
- <option value="<%= window.getName() %>"><%=
window.getInstanceRef() %>
+ <option value="<%= window.getName() %>"><%=
portletContent.getInstanceRef() %>
</option>
<%
+ }
}
%>
</select>