[portal-commits] JBoss Portal SVN: r11906 - in branches/JBoss_Portal_Branch_2_7/core-identity/src: resources/portal-identity-sar/conf/bundles and 1 other directories.
Author: bdaw
Date: 2008-09-16 06:50:12 -0400 (Tue, 16 Sep 2008)
New Revision: 11906
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
Log:
sync JBPORTAL-2164 from 2.6 branch
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2008-09-16
10:32:59 UTC (rev 11905)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2008-09-16
10:50:12 UTC (rev 11906)
@@ -272,12 +272,12 @@
catch (IdentityException e)
{
log.error("error while updating password", e);
- ctx.addMessage("status", new
FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new
FacesMessage(FacesMessage.SEVERITY_ERROR,
bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"), ""));
}
}
else
{
- ctx.addMessage("status", new
FacesMessage(bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR")));
+ ctx.addMessage("status", new FacesMessage(FacesMessage.SEVERITY_ERROR,
bundle.getString("IDENTITY_EDIT_CHANGE_PASSWORD_ERROR"), ""));
}
this.resetWindowState(ctx);
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-16
10:32:59 UTC (rev 11905)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-09-16
10:50:12 UTC (rev 11906)
@@ -51,8 +51,8 @@
IDENTITY_EDIT_PASSWORD_TITLE=Change your password
IDENTITY_EDIT_PASSWORD_CURRENT=Current password
IDENTITY_EDIT_CHANGE_PASSWORD=Change password
-IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change your password.
-IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Your password has been updated.
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Could not change password.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=Password has been updated.
IDENTITY_EDIT_EMAIL_TITLE=Change your email address
IDENTITY_EDIT_EMAIL_NEW=New email address
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-09-16
10:32:59 UTC (rev 11905)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/jsf/admin/user/searchUsers.xhtml 2008-09-16
10:50:12 UTC (rev 11906)
@@ -20,7 +20,9 @@
<ui:define name="content">
<h3><h:outputText
value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"/></h3>
- <h:form>
+ <h:messages infoClass="portlet-msg-success"
errorClass="portlet-msg-error"
+ fatalClass="portlet-msg-error"
warnClass="portlet-msg-alert"/>
+ <h:form>
<h:panelGrid columns="4">
<h:inputText id="searchString"
value="#{useradministrationbean.searchString}" />
<h:commandButton id ="search"
value="#{bundle.IDENTITY_MANAGEMENT_SEARCH_USER}"
action="#{useradministrationbean.searchUsers}"
styleClass="portlet-form-button"/>