Author: thomas.heute(a)jboss.com
Date: 2008-05-09 03:59:11 -0400 (Fri, 09 May 2008)
New Revision: 10759
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
Log:
JBPORTAL-2010: error after deleting a WSRP consumer
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2008-05-07
18:47:14 UTC (rev 10758)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2008-05-09
07:59:11 UTC (rev 10759)
@@ -279,8 +279,17 @@
if (portlets == null)
{
portlets = new ArrayList();
- List tmpPortlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
-
+
+ List tmpPortlets = null;
+
+ if (getSelectedPortletInvoker() != null)
+ {
+ tmpPortlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
+ }
+ else
+ {
+ tmpPortlets = new
ArrayList(federatingPortletInvoker.getFederatedInvoker("local").getPortlets());
+ }
// Remove content editors
nextPortlet:
for (Iterator i = tmpPortlets.iterator(); i.hasNext();)
@@ -333,7 +342,7 @@
public Portlet getSelectedPortlet()
{
- if (selectedPortlet == null && selectedPortletId != null)
+ if (selectedPortlet == null && selectedPortletId != null &&
getSelectedPortletInvoker() != null)
{
try
{
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-05-07
18:47:14 UTC (rev 10758)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-05-09
07:59:11 UTC (rev 10759)
@@ -17,7 +17,7 @@
<h:commandLink value="Portlet Instances"
action="instances"/>
</li>
<li>
- <h:commandLink value="Portlet Definitions"
action="portlets"/>
+ <h:commandLink value="Portlet Definitions"
action="#{portletmgr.selectPortlet}"/>
</li>
<li id="currentTab">Dashboards</li>
</ul>
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2008-05-07
18:47:14 UTC (rev 10758)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2008-05-09
07:59:11 UTC (rev 10759)
@@ -13,7 +13,7 @@
</li>
<li id="currentTab">Portlet Instances</li>
<li>
- <h:commandLink value="Portlet Definitions"
action="portlets"/>
+ <h:commandLink value="Portlet Definitions"
action="#{portletmgr.selectPortlet}"/>
</li>
<li>
<h:commandLink value="Dashboards"
action="dashboards"/>
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2008-05-07
18:47:14 UTC (rev 10758)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2008-05-09
07:59:11 UTC (rev 10759)
@@ -15,7 +15,7 @@
<h:commandLink value="Portlet Instances"
action="instances"/>
</li>
<li>
- <h:commandLink value="Portlet Definitions"
action="portlets"/>
+ <h:commandLink value="Portlet Definitions"
action="#{portletmgr.selectPortlet}"/>
</li>
<li>
<h:commandLink value="Dashboards"
action="dashboards"/>
Show replies by date