JBoss Portal SVN: r12408 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-12-18 17:45:35 -0500 (Thu, 18 Dec 2008)
New Revision: 12408
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/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_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-12-18 22:45:02 UTC (rev 12407)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2008-12-18 22:45:35 UTC (rev 12408)
@@ -25,7 +25,6 @@
import org.apache.commons.lang.StringEscapeUtils;
import org.jboss.portal.Mode;
-import org.jboss.portal.faces.util.JSFFunctor;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
@@ -142,16 +141,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_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-12-18 22:45:02 UTC (rev 12407)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-12-18 22:45:35 UTC (rev 12408)
@@ -27,7 +27,7 @@
class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
<td>
<img src="#{instance.portlet.smallIconLocation}" alt="icon" align="middle" style="margin:0 4px 0 0"/>
- <h:commandLink id="#{instancemgr.idSanitizer[instance.id]}" action="#{instancemgr.selectInstance}">
+ <h:commandLink id="instance-#{status.index}" action="#{instancemgr.selectInstance}">
<h:outputText value="#{instance.id}"/>
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="info"/>
@@ -36,18 +36,18 @@
<td>
<h:outputText value="#{instance.displayName}"/>
</td>
- <td><h:commandLink id="security-#{instancemgr.idSanitizer[instance.id]}" action="#{instancemgr.selectInstance}" styleClass="actionSecurity">
+ <td><h:commandLink id="security-instance-#{status.index}" action="#{instancemgr.selectInstance}" styleClass="actionSecurity">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="security"/>
#{bundle.SECURITY}
</h:commandLink> | <h:panelGroup
rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}">
- <h:commandLink id="preference-#{instancemgr.idSanitizer[instance.id]}"
+ <h:commandLink id="preference-instance-#{status.index}"
action="#{instancemgr.selectInstance}" styleClass="actionPreferences">
<f:param name="id" value="#{instance.id}"/>
<f:param name="plugin" value="preferences"/>
#{bundle.PREFERENCES}
- </h:commandLink> | </h:panelGroup><h:commandLink id="delete-#{instancemgr.idSanitizer[instance.id]}" action="confirmDeleteInstance"
+ </h:commandLink> | </h:panelGroup><h:commandLink id="delete-instance-#{status.index}" action="confirmDeleteInstance"
styleClass="actionDelete"
actionListener="#{instancemgr.selectInstance}">
<f:param name="id" value="#{instance.id}"/>
17 years, 7 months
JBoss Portal SVN: r12407 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/jsf and 1 other directory.
by portal-commits＠lists.jboss.org
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}"/>
17 years, 7 months