Fixed #27

GluuFederation · Feb 13, 2015 · dec0367 · dec0367
1 parent f2d2811
commit dec0367
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/server/src/main/java/org/gluu/oxtrust/action/PasswordReminderAction.java b/server/src/main/java/org/gluu/oxtrust/action/PasswordReminderAction.java
@@ -68,7 +68,7 @@
 											+ "and follow instructions there.\n\n"
 											+ "If you have not requested password reset for %2$s identity server please ignore this email.\n\n"
 											+ "Kind regards,\n"
-											+ "%1$s Identity Server Support";
+											+ "%2$s Identity Server Support";
 
 	@Logger
 	private Log log;

diff --git a/server/src/main/webapp/person/passwordReminder.page.xml b/server/src/main/webapp/person/passwordReminder.page.xml
@@ -7,7 +7,8 @@
 
       <navigation from-action="#{passwordReminderAction.requestReminder}">
         <rule if-outcome="success">
-         <redirect>
+        <end-conversation />
+         <redirect view-id="/home.xhtml">
             <message severity="ERROR">We have sent a letter with password reset instructions to the specified email.</message>
             </redirect>
         </rule>

diff --git a/server/src/main/webapp/person/passwordReminder.xhtml b/server/src/main/webapp/person/passwordReminder.xhtml
@@ -16,11 +16,6 @@
     		<rich:panel rendered="#{not identity.loggedIn}">
 
             	<f:facet name="header">Reset Password Form</f:facet>
-
-            <h:messages id="messages" globalOnly="true" styleClass="message"
-                        errorClass="errormsg" infoClass="infomsg" warnClass="warnmsg"
-                        rendered="#{showGlobalMessages != 'false'}"/>
-
 				<div class="dialog">
 					<h:panelGrid columns="2" rowClasses="prop" columnClasses="name,value" width="1000">
 				        	<h:outputLabel for="email">Enter your email</h:outputLabel>