Author: emuckenhuber Date: 2007-09-21 07:09:27 -0400 (Fri, 21 Sep 2007) New Revision: 8399 Removed: trunk/core-identity/src/main/org/jboss/portal/core/identity/test/ Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml Log: - disable portlet on configuration error - Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-21 10:29:43 UTC (rev 8398) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-21 11:09:27 UTC (rev 8399) @@ -65,6 +65,10 @@ { this.identityUIConfigurationService.isValidConfiguration(); } + catch(NullPointerException e) + { + return false; + } catch(CoreIdentityConfigurationException e) { log.error("", e); Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 10:29:43 UTC (rev 8398) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21 11:09:27 UTC (rev 8399) @@ -81,7 +81,7 @@ <hr/> <h:form> <h4><h:outputText value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h4> - <h:panelGrid columns="4"> + <h:panelGrid columns="3"> <h:inputText id="searchString" value="#{rolemanagementbean.userNameFilter}" /> <h:commandButton value="Search" action="#{rolemanagementbean.viewRoleMembers}" styleClass="portlet-form-button" /> <h:selectOneMenu id="limit" value="#{rolemanagementbean.limit}"> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21 10:29:43 UTC (rev 8398) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21 11:09:27 UTC (rev 8399) @@ -13,8 +13,11 @@ <h:commandLink action="userAdmin" value="#{bundle.IDENTITY_MANAGEMENT_USER_MANAGEMENT}" /> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> + <li class="pathItem"> + <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLES}" /> + </li> + <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ASSIGN_ROLE_TO_USER}" /> <h:outputText value="#{userregistermgr.uiUser.username}" /> </li> </ui:define>