You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/02/03 15:56:32 UTC
svn commit: r1563938 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Author: solomax
Date: Mon Feb 3 14:56:31 2014
New Revision: 1563938
URL: http://svn.apache.org/r1563938
Log:
[OPENMEETINGS-907] password field is enabled/disabled on new model
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1563938&r1=1563937&r2=1563938&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Mon Feb 3 14:56:31 2014
@@ -212,10 +212,11 @@ public class AppointmentDialog extends A
}
private class AppointmentForm extends Form<Appointment> {
- private static final long serialVersionUID = -1764738237821487526L;
+ private static final long serialVersionUID = 1L;
private boolean createRoom = true;
private DateTimeField start;
private DateTimeField end;
+ private final PasswordTextField pwd = new PasswordTextField("password");
@Override
protected void onModelChanged() {
@@ -253,6 +254,7 @@ public class AppointmentDialog extends A
attendeesModel.getObject().add(mm.getUser());
}
}
+ pwd.setEnabled(a.isPasswordProtected());
}
public AppointmentForm(String id, IModel<Appointment> model) {
@@ -268,7 +270,6 @@ public class AppointmentDialog extends A
add(new TextField<String>("location"));
add(start = new DateTimeField("start"));
add(end = new DateTimeField("end"));
- final PasswordTextField pwd = new PasswordTextField("password");
pwd.setEnabled(getModelObject().isPasswordProtected());
pwd.setOutputMarkupId(true);
add(pwd);
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1563938&r1=1563937&r2=1563938&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Mon Feb 3 14:56:31 2014
@@ -212,10 +212,11 @@ public class AppointmentDialog extends A
}
private class AppointmentForm extends Form<Appointment> {
- private static final long serialVersionUID = -1764738237821487526L;
+ private static final long serialVersionUID = 1L;
private boolean createRoom = true;
private DateTimeField start;
private DateTimeField end;
+ private final PasswordTextField pwd = new PasswordTextField("password");
@Override
protected void onModelChanged() {
@@ -253,6 +254,7 @@ public class AppointmentDialog extends A
attendeesModel.getObject().add(mm.getUser());
}
}
+ pwd.setEnabled(a.isPasswordProtected());
}
public AppointmentForm(String id, IModel<Appointment> model) {
@@ -268,7 +270,6 @@ public class AppointmentDialog extends A
add(new TextField<String>("location"));
add(start = new DateTimeField("start"));
add(end = new DateTimeField("end"));
- final PasswordTextField pwd = new PasswordTextField("password");
pwd.setEnabled(getModelObject().isPasswordProtected());
pwd.setOutputMarkupId(true);
add(pwd);