[portal-commits] JBoss Portal SVN: r11690 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.

Author: chris.laprun(a)jboss.com Date: 2008-08-12 04:55:39 -0400 (Tue, 12 Aug 2008) New Revision: 11690 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml Log: - editCoordination is not listener anymore so that CoordinationAction is more in line with other actions. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-12 03:57:40 UTC (rev 11689) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CoordinationAction.java 2008-08-12 08:55:39 UTC (rev 11690) @@ -203,7 +203,7 @@ this.stringStub = stringStub; } - public String editCoordination(ActionEvent event) throws ConversionException + public String editCoordination() throws ConversionException { PortalObject portalObject = getSelectedObject(); Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-12 03:57:40 UTC (rev 11689) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-08-12 08:55:39 UTC (rev 11690) @@ -41,8 +41,8 @@ #{bundle.DISPLAY_NAMES} </h:commandLink> <h:panelGroup rendered="#{'page' eq portalobjectmgr.selectedObjectType}"> - | <h:commandLink action="editCoordination" - actionListener="#{coordinationAction.editCoordination}" + | <h:commandLink action="#{coordinationAction.editCoordination}" + actionListener="#{portalobjectmgr.selectObject}" styleClass="actionCoordination"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> #{bundle.COORDINATION_COORDINATION} Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-12 03:57:40 UTC (rev 11689) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-08-12 08:55:39 UTC (rev 11690) @@ -108,8 +108,8 @@ actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> #{bundle.DISPLAY_NAMES} - </h:commandLink> | <h:commandLink action="editCoordination" styleClass="actionCoordination" - actionListener="#{coordinationAction.editCoordination}"> + </h:commandLink> | <h:commandLink action="#{coordinationAction.editCoordination}" styleClass="actionCoordination" + actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> #{bundle.COORDINATION_COORDINATION} </h:commandLink>