svn commit: r1624201 - /openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java

[solomax]

Author: solomax
Date: Thu Sep 11 05:58:09 2014
New Revision: 1624201

URL: http://svn.apache.org/r1624201
Log:
[OPENMEETINGS-1018] buttons are initially disabled

Modified:
    
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1624201&r1=1624200&r2=1624201&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
 Thu Sep 11 05:58:09 2014
@@ -120,6 +120,8 @@ public class InvitationDialog extends Ab
                tzId.setObject(u.getTimeZoneId());
                
lang.setObject(getBean(FieldLanguageDao.class).get(u.getLanguage_id()));
                form.setModelObject(i);
+               send.setEnabled(false, target);
+               generate.setEnabled(false, target);
                target.add(form);
        }
 
@@ -198,7 +200,9 @@ public class InvitationDialog extends Ab
                
                                                @Override
                                                protected void 
onUpdate(AjaxRequestTarget target) {
-                                                       
generate.setEnabled(modelTo.getObject().size() < 2, target);
+                                                       Collection<User> to = 
modelTo.getObject();
+                                                       
send.setEnabled(to.size() > 0, target);
+                                                       
generate.setEnabled(to.size() == 1, target);
                                                }
                                        }));
                        add(new TextField<String>("subject", subject));
@@ -262,7 +266,7 @@ public class InvitationDialog extends Ab
                
                @Override
                protected void onValidate() {
-                       if 
(from.getConvertedInput().after(to.getConvertedInput())) {
+                       if (from.getConvertedInput() != null && 
to.getConvertedInput() != null && 
from.getConvertedInput().after(to.getConvertedInput())) {
                                error(WebSession.getString(1592));
                        }
                }