svn commit: r1481618 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components: GeneralUserForm.java admin/users/UserForm.java

[solomax]

Author: solomax
Date: Sun May 12 18:09:21 2013
New Revision: 1481618

URL: http://svn.apache.org/r1481618
Log:
User/email login validation is fixed

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/GeneralUserForm.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/GeneralUserForm.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/GeneralUserForm.java?rev=1481618&r1=1481617&r2=1481618&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/GeneralUserForm.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/GeneralUserForm.java
 Sun May 12 18:09:21 2013
@@ -66,6 +66,7 @@ public class GeneralUserForm extends For
        private Salutation salutation;
        private FieldLanguage lang;
        private PasswordTextField passwordField;
+       private RequiredTextField<String> email;
 
        public GeneralUserForm(String id, IModel<User> model, boolean 
isAdminForm) {
                super(id, model);
@@ -110,7 +111,8 @@ public class GeneralUserForm extends For
                                }
                        }));
 
-               add(new 
RequiredTextField<String>("adresses.email").add(RfcCompliantEmailAddressValidator.getInstance()));
+               add(email = new RequiredTextField<String>("adresses.email"));
+               email.add(RfcCompliantEmailAddressValidator.getInstance());
                add(new TextField<String>("adresses.phone"));
                add(new CheckBox("sendSMS"));
                DateTextField age = new DateTextField("age");
@@ -152,7 +154,7 @@ public class GeneralUserForm extends For
 
        @Override
        protected void onValidate() {
-               
if(getBean(EmailManager.class).checkUserEMail(getModelObject().getAdresses().getEmail()))
 {
+               
if(!getBean(EmailManager.class).checkUserEMail(email.getConvertedInput())) {
                        error(WebSession.getString(1000));
                }
                super.onValidate();

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java?rev=1481618&r1=1481617&r2=1481618&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
 Sun May 12 18:09:21 2013
@@ -195,7 +195,7 @@ public class UserForm extends AdminBaseF
 
        @Override
        protected void onValidate() {
-               
if(getBean(UsersDao.class).checkUserLogin(login.getConvertedInput())) {
+               
if(!getBean(UsersDao.class).checkUserLogin(login.getConvertedInput())) {
                        error(WebSession.getString(105));
                }
        }