JBoss Portal SVN: r12397 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-12-17 11:06:16 -0500 (Wed, 17 Dec 2008)
New Revision: 12397
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
Log:
- Added alt attribute.
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-17 16:04:55 UTC (rev 12396)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-12-17 16:06:16 UTC (rev 12397)
@@ -39,7 +39,8 @@
<tr
class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
<td>
- <img src="#{instance.portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/>
+ <img src="#{instance.portlet.smallIconLocation}" alt="icon" align="middle"
+ style="margin:0 4px 0 0"/>
<h:commandLink id="#{instance.id}" action="#{instancemgr.selectInstance}">
<h:outputText value="#{instance.id}"/>
<f:param name="id" value="#{instance.id}"/>
17 years, 7 months
JBoss Portal SVN: r12396 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-12-17 11:04:55 -0500 (Wed, 17 Dec 2008)
New Revision: 12396
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
Log:
- Reformat.
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-17 11:56:45 UTC (rev 12395)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-12-17 16:04:55 UTC (rev 12396)
@@ -6,174 +6,183 @@
xmlns:jbp="http://www.jboss.com/portal"
xmlns:c="http://java.sun.com/jstl/core">
-<ui:composition template="instancesTemplate.xhtml">
+ <ui:composition template="instancesTemplate.xhtml">
-<ui:define name="content">
+ <ui:define name="content">
-<c:if test="#{empty instancemgr.selectedPlugin}">
- <h:form id="instances-form">
- <ul class="pagination property-container">
- <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}">
- <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1"
- var="index">
- <li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}">
- <h:commandLink action="#{instancemgr.selectFrom}">
- <f:param name="from" value="#{index * instancemgr.paginationSize}"/>
- <h:outputText value="#{index * instancemgr.paginationSize}"/>
- </h:commandLink>
- </li>
- </c:forEach>
+ <c:if test="#{empty instancemgr.selectedPlugin}">
+ <h:form id="instances-form">
+ <ul class="pagination property-container">
+ <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}">
+ <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1"
+ var="index">
+ <li
+ class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}">
+ <h:commandLink action="#{instancemgr.selectFrom}">
+ <f:param name="from" value="#{index * instancemgr.paginationSize}"/>
+ <h:outputText value="#{index * instancemgr.paginationSize}"/>
+ </h:commandLink>
+ </li>
+ </c:forEach>
+ </c:if>
+ </ul>
+ <table id="instancesTable2" class="portlet-def-table datatable">
+ <thead class="portlet-section-header">
+ <tr>
+ <th>#{bundle.INSTANCE_ID}</th>
+ <th>#{bundle.INSTANCE_NAME}</th>
+ <th>#{bundle.ACTIONS}</th>
+ </tr>
+ </thead>
+ <tbody>
+ <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status">
+ <tr
+ class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
+ <td>
+ <img src="#{instance.portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/>
+ <h:commandLink id="#{instance.id}" action="#{instancemgr.selectInstance}">
+ <h:outputText value="#{instance.id}"/>
+ <f:param name="id" value="#{instance.id}"/>
+ <f:param name="plugin" value="info"/>
+ </h:commandLink>
+ </td>
+ <td>
+ <h:outputText value="#{instance.displayName}"/>
+ </td>
+ <td>
+ <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
+ <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity"
+ id="security-#{instance.id}">
+ <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-#{instance.id}" action="#{instancemgr.selectInstance}"
+ styleClass="actionPreferences">
+ <f:param name="id" value="#{instance.id}"/>
+ <f:param name="plugin" value="preferences"/>
+ #{bundle.PREFERENCES}
+ </h:commandLink>
+ <h:commandLink action="confirmDeleteInstance" id="delete-#{instance.id}"
+ styleClass="actionDeleteInstance"
+ actionListener="#{instancemgr.selectInstance}">
+ <f:param name="id" value="#{instance.id}"/>
+ #{bundle.COMMON_DELETE}
+ </h:commandLink>
+ </h:panelGrid>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ <tfoot class="portlet-section-header">
+ <tr>
+ <th>#{bundle.INSTANCE_ID}</th>
+ <th>#{bundle.INSTANCE_NAME}</th>
+ <th>#{bundle.ACTIONS}</th>
+ </tr>
+ </tfoot>
+ </table>
+ <ul class="pagination property-container">
+ <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}">
+ <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1"
+ var="index">
+ <li
+ class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}">
+ <h:commandLink id="pagination-#{index}" action="#{instancemgr.selectFrom}">
+ <f:param name="from" value="#{index * instancemgr.paginationSize}"/>
+ <h:outputText value="#{index * instancemgr.paginationSize}"/>
+ </h:commandLink>
+ </li>
+ </c:forEach>
+ </c:if>
+ </ul>
+ </h:form>
</c:if>
- </ul>
- <table id="instancesTable2" class="portlet-def-table datatable">
- <thead class="portlet-section-header">
- <tr>
- <th>#{bundle.INSTANCE_ID}</th>
- <th>#{bundle.INSTANCE_NAME}</th>
- <th>#{bundle.ACTIONS}</th>
- </tr>
- </thead>
- <tbody>
- <c:forEach items="#{instancemgr.selectedInstances}" var="instance" varStatus="status">
- <tr
- class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}">
- <td>
- <img src="#{instance.portlet.smallIconLocation}" align="middle" style="margin:0 4px 0 0"/>
- <h:commandLink id="#{instance.id}" action="#{instancemgr.selectInstance}">
- <h:outputText value="#{instance.id}"/>
- <f:param name="id" value="#{instance.id}"/>
- <f:param name="plugin" value="info"/>
- </h:commandLink>
- </td>
- <td>
- <h:outputText value="#{instance.displayName}"/>
- </td>
- <td>
- <h:panelGrid columns="7" cellpadding="0" cellspacing="0" border="0">
- <h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity" id="security-#{instance.id}">
- <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-#{instance.id}" action="#{instancemgr.selectInstance}" styleClass="actionPreferences">
- <f:param name="id" value="#{instance.id}"/>
- <f:param name="plugin" value="preferences"/>
- #{bundle.PREFERENCES}
- </h:commandLink>
- <h:commandLink action="confirmDeleteInstance" id="delete-#{instance.id}"
- styleClass="actionDeleteInstance"
- actionListener="#{instancemgr.selectInstance}">
- <f:param name="id" value="#{instance.id}"/>
- #{bundle.COMMON_DELETE}
- </h:commandLink>
- </h:panelGrid>
- </td>
- </tr>
- </c:forEach>
- </tbody>
- <tfoot class="portlet-section-header">
- <tr>
- <th>#{bundle.INSTANCE_ID}</th>
- <th>#{bundle.INSTANCE_NAME}</th>
- <th>#{bundle.ACTIONS}</th>
- </tr>
- </tfoot>
- </table>
- <ul class="pagination property-container">
- <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}">
- <c:forEach begin="0" end="#{(instancemgr.instanceCount - 1)/ instancemgr.paginationSize}" step="1"
- var="index">
- <li class="#{index == (instancemgr.selectedFrom / instancemgr.paginationSize)? 'selected' : ''}">
- <h:commandLink id="pagination-#{index}" action="#{instancemgr.selectFrom}">
- <f:param name="from" value="#{index * instancemgr.paginationSize}"/>
- <h:outputText value="#{index * instancemgr.paginationSize}"/>
- </h:commandLink>
- </li>
- </c:forEach>
- </c:if>
- </ul>
- </h:form>
-</c:if>
-<c:if test="#{instancemgr.selectedPlugin == 'info'}">
- <!-- Path nav -->
- <h:form id="instance-form1">
- <ul class="objectpath">
- <li class="pathItem">
- <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
- </li>
- <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li class="selected">
- <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS}
- </li>
- </ul>
- </h:form>
- <br/>
- <c:choose>
- <c:when test="#{instancemgr.selectedInstance.portlet != null}">
- <ui:include src="common/showPortletDetails.xhtml">
- <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/>
- <ui:param name="portletmgr" value="#{portletmgr}"/>
- <ui:param name="showDisplayNameEditor" value="true"/>
- </ui:include>
- </c:when>
- <c:otherwise>
- #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}.
- </c:otherwise>
- </c:choose>
-</c:if>
+ <c:if test="#{instancemgr.selectedPlugin == 'info'}">
+ <!-- Path nav -->
+ <h:form id="instance-form1">
+ <ul class="objectpath">
+ <li class="pathItem">
+ <h:commandLink id="instance-link"
+ action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS}
+ </li>
+ </ul>
+ </h:form>
+ <br/>
+ <c:choose>
+ <c:when test="#{instancemgr.selectedInstance.portlet != null}">
+ <ui:include src="common/showPortletDetails.xhtml">
+ <ui:param name="portlet" value="#{instancemgr.selectedInstance.portlet}"/>
+ <ui:param name="portletmgr" value="#{portletmgr}"/>
+ <ui:param name="showDisplayNameEditor" value="true"/>
+ </ui:include>
+ </c:when>
+ <c:otherwise>
+ #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}.
+ </c:otherwise>
+ </c:choose>
+ </c:if>
-<c:if test="#{instancemgr.selectedPlugin == 'preferences'}">
- <!-- Path nav -->
- <h:form id="instance-form2">
- <ul class="objectpath">
- <li class="pathItem">
- <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
- </li>
- <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li class="selected">
- <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP}
- </li>
- </ul>
- </h:form>
- <br/>
+ <c:if test="#{instancemgr.selectedPlugin == 'preferences'}">
+ <!-- Path nav -->
+ <h:form id="instance-form2">
+ <ul class="objectpath">
+ <li class="pathItem">
+ <h:commandLink id="instance-link"
+ action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES_NO_CAP}
+ </li>
+ </ul>
+ </h:form>
+ <br/>
- <div class="property-container">
- <ui:include src="common/editPreferences.xhtml">
- <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/>
- </ui:include>
- <br />
- <h:form>
- <h:commandButton id="save" value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/>
- <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/>
- </h:form>
- </div>
-</c:if>
+ <div class="property-container">
+ <ui:include src="common/editPreferences.xhtml">
+ <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/>
+ </ui:include>
+ <br/>
+ <h:form>
+ <h:commandButton id="save" value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}"
+ styleClass="portlet-form-button"/>
+ <h:commandButton id="cancel" value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}"
+ styleClass="portlet-form-button"/>
+ </h:form>
+ </div>
+ </c:if>
-<c:if test="#{instancemgr.selectedPlugin == 'security'}">
- <!-- Path nav -->
- <h:form id="instance-form3">
- <ul class="objectpath">
- <li class="pathItem">
- <h:commandLink id="instance-link" action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
- </li>
- <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
- <li class="selected">
- <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS}
- </li>
- </ul>
- </h:form>
- <br/>
+ <c:if test="#{instancemgr.selectedPlugin == 'security'}">
+ <!-- Path nav -->
+ <h:form id="instance-form3">
+ <ul class="objectpath">
+ <li class="pathItem">
+ <h:commandLink id="instance-link"
+ action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink>
+ </li>
+ <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li>
+ <li class="selected">
+ <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS}
+ </li>
+ </ul>
+ </h:form>
+ <br/>
- <div class="property-container">
- <ui:decorate template="/jsf/common/editSecurity.xhtml">
- <ui:param name="auth" value="#{instancemgr.auth}"/>
- </ui:decorate>
- </div>
-</c:if>
+ <div class="property-container">
+ <ui:decorate template="/jsf/common/editSecurity.xhtml">
+ <ui:param name="auth" value="#{instancemgr.auth}"/>
+ </ui:decorate>
+ </div>
+ </c:if>
-</ui:define>
-</ui:composition>
+ </ui:define>
+ </ui:composition>
</div>
17 years, 7 months
JBoss Portal SVN: r12395 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-12-17 06:56:45 -0500 (Wed, 17 Dec 2008)
New Revision: 12395
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
Log:
JBPORTAL-2232: Changes made to PortletPreferences do not persist during a JSR 286 serveResource method call
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-12-16 16:48:07 UTC (rev 12394)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-12-17 11:56:45 UTC (rev 12395)
@@ -34,8 +34,10 @@
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.EventInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.invocation.ResourceInvocation;
import org.jboss.portal.portlet.PortletInvokerInterceptor;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.spi.InstanceContext;
@@ -228,7 +230,7 @@
int status = prefs.getStatus();
// Producer state management if the invocation was succesful
- if (invocation instanceof ActionInvocation && status == AbstractPropertyContext.UPDATE_SUCCESSFUL)
+ if ((invocation instanceof ActionInvocation || invocation instanceof ResourceInvocation || invocation instanceof EventInvocation) && status == AbstractPropertyContext.UPDATE_SUCCESSFUL)
{
// Get the potentially updated prefs
PropertyMap newPrefs = prefs.getPrefs();
17 years, 7 months