You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2010/01/22 16:31:19 UTC
svn commit: r902120 -
/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java
Author: simoneg
Date: Fri Jan 22 15:31:19 2010
New Revision: 902120
URL: http://svn.apache.org/viewvc?rev=902120&view=rev
Log:
Display error in form instead than in header
Modified:
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java
Modified: labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java?rev=902120&r1=902119&r2=902120&view=diff
==============================================================================
--- labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java (original)
+++ labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/UserWebHandler.java Fri Jan 22 15:31:19 2010
@@ -16,6 +16,7 @@
*/
package org.apache.magma.web.user;
+import org.apache.magma.basics.LocalizableString;
import org.apache.magma.domain.user.User;
import java.util.List;
@@ -49,9 +50,9 @@
public HtmlProducer hiddenRegister(User user) {
// TODO move this check in a validator or something
if (!user.getPassword().equals(user.getConfirmPassword())) {
- StringHtmlProducer passwordError = new StringHtmlProducer("wrong password");
- passwordError.compoundWith(handleNewUser().doShow(), CompoundType.AFTER);
- return passwordError;
+ SmartForm sf = handleNewUser();
+ sf.addError(user.beanData().getProperty("confirmPassword"), new LocalizableString("The two passwords does not match"));
+ return sf.do_default();
}
new Database().save(user);
try {
@@ -65,7 +66,7 @@
} catch (Exception e) {
e.printStackTrace();
StringHtmlProducer error = new StringHtmlProducer("Error sending email");
- error.compoundWith(handleNewUser().doShow(), CompoundType.AFTER);
+ //error.compoundWith(handleNewUser().doShow(), CompoundType.AFTER);
return error;
}
return doRegistered(user);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org