[portal-commits] JBoss Portal SVN: r8400 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: main/org/jboss/portal/core/identity/ui/common and 2 other directories.
Author: emuckenhuber
Date: 2007-09-21 07:11:51 -0400 (Fri, 21 Sep 2007)
New Revision: 8400
Removed:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/test/
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
Log:
- disable portlet on configuration error
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-21
11:09:27 UTC (rev 8399)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/common/ConfigurationBean.java 2007-09-21
11:11:51 UTC (rev 8400)
@@ -65,6 +65,10 @@
{
this.identityUIConfigurationService.isValidConfiguration();
}
+ catch(NullPointerException e)
+ {
+ return false;
+ }
catch(CoreIdentityConfigurationException e)
{
log.error("", e);
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21
11:09:27 UTC (rev 8399)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-21
11:11:51 UTC (rev 8400)
@@ -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:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21
11:09:27 UTC (rev 8399)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/user/registerRoles.xhtml 2007-09-21
11:11:51 UTC (rev 8400)
@@ -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>