Author: chris.laprun(a)jboss.com Date: 2008-12-18 17:45:02 -0500 (Thu, 18 Dec 2008) New Revision: 12407 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml Log: - JBPORTAL-2264, JBPORTAL-2259: Functor was an interesting solution but a better one is to not use instance id as HTML id... Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-12-18 19:33:29 UTC (rev 12406) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-12-18 22:45:02 UTC (rev 12407) @@ -27,7 +27,6 @@ import org.jboss.portal.core.model.instance.InstanceContainer; import org.jboss.portal.core.model.instance.InstanceDefinition; import org.jboss.portal.core.model.instance.NoSuchInstanceException; -import org.jboss.portal.faces.util.JSFFunctor; import org.jboss.portal.identity.RoleModule; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletInvokerException; @@ -138,16 +137,6 @@ this.domainConfigurator = domainConfigurator; } - /** - * Functor acccess to sanitize identifiers. - * - * @return - */ - public JSFFunctor getIdSanitizer() - { - return JSFFunctor.ID_SANITIZER; - } - // Navigational state accessor public int getPaginationSize() Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-12-18 19:33:29 UTC (rev 12406) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-12-18 22:45:02 UTC (rev 12407) @@ -41,7 +41,7 @@ <td> <img src="#{instance.portlet.smallIconLocation}" alt="icon" align="middle" style="margin:0 4px 0 0"/> - <h:commandLink id="#{instancemgr.idSanitizer[instance.id]}" + <h:commandLink id="instance-#{status.index}" action="#{instancemgr.selectInstance}"> <h:outputText value="#{instance.id}"/> <f:param name="id" value="#{instance.id}"/> @@ -54,13 +54,13 @@ <td> <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0"> <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity" - id="security-#{instancemgr.idSanitizer[instance.id]}"> + id="security-instance-#{status.index}"> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="security"/> #{bundle.SECURITY} </h:commandLink> <h:commandLink rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}" - id="preference-#{instancemgr.idSanitizer[instance.id]}" + id="preference-instance-#{status.index}" action="#{instancemgr.selectInstance}" styleClass="actionPreferences"> <f:param name="id" value="#{instance.id}"/> @@ -68,7 +68,7 @@ #{bundle.PREFERENCES} </h:commandLink> <h:commandLink action="confirmDeleteInstance" - id="delete-#{instancemgr.idSanitizer[instance.id]}" + id="delete-instance-#{status.index}" styleClass="actionDeleteInstance" actionListener="#{instancemgr.selectInstance}"> <f:param name="id" value="#{instance.id}"/>