[portal-commits] JBoss Portal SVN: r7488 - in tags/JBoss_Portal_2_6_0_CR3/core-admin/src: resources/portal-admin-war/WEB-INF and 1 other directories.

Author: julien(a)jboss.com Date: 2007-06-20 17:13:29 -0400 (Wed, 20 Jun 2007) New Revision: 7488 Modified: tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml Log: when portlet provider is changed, reset the pagination index to 0 / increased the pagination size to 20 / externalized the pagination size in faces-config.xml / do not display paginator when count < pagination size Modified: tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-06-20 21:11:01 UTC (rev 7487) +++ tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-06-20 21:13:29 UTC (rev 7488) @@ -85,7 +85,7 @@ private Integer selectedRow; /** . */ - private final int paginationSize = 10; + private int paginationSize; // Runtime fields depending on the navigational state @@ -140,6 +140,11 @@ return paginationSize; } + public void setPaginationSize(int paginationSize) + { + this.paginationSize = paginationSize; + } + public int getSelectedFrom() { return selectedFrom; @@ -247,7 +252,7 @@ List list = getInstances(); // - int to = Math.min(selectedFrom + 10, list.size()); + int to = Math.min(selectedFrom + paginationSize, list.size()); // return list.subList(selectedFrom, to); Modified: tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java =================================================================== --- tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-06-20 21:11:01 UTC (rev 7487) +++ tags/JBoss_Portal_2_6_0_CR3/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-06-20 21:13:29 UTC (rev 7488) @@ -85,7 +85,7 @@ private int selectedFrom; /** . */ - private final int paginationSize = 10; + private int paginationSize; /** . */ private String selectedPortletId; @@ -162,6 +162,11 @@ return paginationSize; } + public void setPaginationSize(int paginationSize) + { + this.paginationSize = paginationSize; + } + public int getSelectedFrom() { return selectedFrom; @@ -191,6 +196,7 @@ { this.selectedPortletInvokerId = selectedPortletInvokerId; this.selectedPortletId = null; + this.selectedFrom = 0; } // Runtime state Modified: tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-20 21:11:01 UTC (rev 7487) +++ tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2007-06-20 21:13:29 UTC (rev 7488) @@ -135,6 +135,10 @@ <property-name>domainConfigurator</property-name> <value>#{applicationScope.AuthorizationDomainRegistry.instance.configurator}</value> </managed-property> + <managed-property> + <property-name>paginationSize</property-name> + <value>20</value> + </managed-property> </managed-bean> <!-- The portlet manager managed bean --> @@ -162,6 +166,10 @@ <property-name>selectedPortletInvokerId</property-name> <value>local</value> </managed-property> + <managed-property> + <property-name>paginationSize</property-name> + <value>20</value> + </managed-property> </managed-bean> <managed-bean> Modified: tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-06-20 21:11:01 UTC (rev 7487) +++ tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-06-20 21:13:29 UTC (rev 7488) @@ -48,13 +48,15 @@ </tbody> </table> <ul class="pagination"> - <c:forEach begin="0" end="#{instancemgr.instanceCount - 1}" step="#{instancemgr.paginationSize}" - var="index"> - <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}"> - <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText - value="#{index}"/></h:commandLink> - </li> - </c:forEach> + <c:if test="#{instancemgr.instanceCount > instancemgr.paginationSize}"> + <c:forEach begin="0" end="#{instancemgr.instanceCount - 1}" step="#{instancemgr.paginationSize}" + var="index"> + <li class="#{index == instancemgr.selectedFrom ? 'selected' : ''}"> + <h:commandLink action="#{instancemgr.selectFrom}"><f:param name="from" value="#{index}"/><h:outputText + value="#{index}"/></h:commandLink> + </li> + </c:forEach> + </c:if> </ul> </h:form> Modified: tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-06-20 21:11:01 UTC (rev 7487) +++ tags/JBoss_Portal_2_6_0_CR3/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2007-06-20 21:13:29 UTC (rev 7488) @@ -63,14 +63,16 @@ </tbody> </table> <ul class="pagination"> - <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}" - var="index"> - <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}"> - <h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from" - value="#{index}"/><h:outputText - value="#{index}"/></h:commandLink> - </li> - </c:forEach> + <c:if test="#{portletmgr.portletCount > portletmgr.paginationSize}"> + <c:forEach begin="0" end="#{portletmgr.portletCount - 1}" step="#{portletmgr.paginationSize}" + var="index"> + <li class="#{index == portletmgr.selectedFrom ? 'selected' : ''}"> + <h:commandLink action="#{portletmgr.selectFrom}"><f:param name="from" + value="#{index}"/><h:outputText + value="#{index}"/></h:commandLink> + </li> + </c:forEach> + </c:if> </ul> </h:form>