[portal-commits] JBoss Portal SVN: r10760 - in tags/JBoss_Portal_2_6_5/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2008-05-09 04:08:14 -0400 (Fri, 09 May 2008) New Revision: 10760 Modified: tags/JBoss_Portal_2_6_5/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml Log: JBPORTAL-2010: error after deleting a WSRP consumer Modified: tags/JBoss_Portal_2_6_5/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java =================================================================== --- tags/JBoss_Portal_2_6_5/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2008-05-09 07:59:11 UTC (rev 10759) +++ tags/JBoss_Portal_2_6_5/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2008-05-09 08:08:14 UTC (rev 10760) @@ -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: tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml =================================================================== --- tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-05-09 07:59:11 UTC (rev 10759) +++ tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-05-09 08:08:14 UTC (rev 10760) @@ -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: tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml =================================================================== --- tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2008-05-09 07:59:11 UTC (rev 10759) +++ tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2008-05-09 08:08:14 UTC (rev 10760) @@ -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: tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2008-05-09 07:59:11 UTC (rev 10759) +++ tags/JBoss_Portal_2_6_5/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2008-05-09 08:08:14 UTC (rev 10760) @@ -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"/>