Author: solomax
Date: Sat Oct 8 15:16:37 2016
New Revision: 1763903
URL: http://svn.apache.org/viewvc?rev=1763903&view=rev
Log:
[OPENMEETINGS-1486] registration dialog is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1763903&r1=1763902&r2=1763903&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
Sat Oct 8 15:16:37 2016
@@ -75,7 +75,6 @@ public abstract class AddFolderDialog ex
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
- super.onOpen(handler);
handler.add(form);
setModelObject(name);
getFeedbackMessages().clear();
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1763903&r1=1763902&r2=1763903&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Sat Oct 8 15:16:37 2016
@@ -148,7 +148,8 @@ public class RegisterDialog extends Abst
country = WebSession.get().getBrowserLocale().getCountry();
}
- public void onOpen(AjaxRequestTarget target) {
+ @Override
+ protected void onOpen(IPartialPageRequestHandler handler) {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
String baseURL = cfgDao.getBaseUrl();
sendEmailAtRegister = 1 ==
cfgDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
@@ -162,7 +163,7 @@ public class RegisterDialog extends Abst
}
confirmRegistration.setModelObject(Application.getString(messageCode));
reset();
- target.add(form);
+ handler.add(form);
}
@Override
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1763903&r1=1763902&r2=1763903&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
Sat Oct 8 15:16:37 2016
@@ -75,7 +75,6 @@ public abstract class AddFolderDialog ex
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
- super.onOpen(handler);
handler.add(form);
setModelObject(name);
getFeedbackMessages().clear();
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1763903&r1=1763902&r2=1763903&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Sat Oct 8 15:16:37 2016
@@ -148,7 +148,8 @@ public class RegisterDialog extends Abst
country = WebSession.get().getBrowserLocale().getCountry();
}
- public void onOpen(AjaxRequestTarget target) {
+ @Override
+ protected void onOpen(IPartialPageRequestHandler handler) {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
String baseURL = cfgDao.getBaseUrl();
sendEmailAtRegister = 1 ==
cfgDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
@@ -162,7 +163,7 @@ public class RegisterDialog extends Abst
}
confirmRegistration.setModelObject(Application.getString(messageCode));
reset();
- target.add(form);
+ handler.add(form);
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1763903&r1=1763902&r2=1763903&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
Sat Oct 8 15:16:37 2016
@@ -75,7 +75,6 @@ public abstract class AddFolderDialog ex
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
- super.onOpen(handler);
handler.add(form);
setModelObject(name);
getFeedbackMessages().clear();
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1763903&r1=1763902&r2=1763903&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Sat Oct 8 15:16:37 2016
@@ -148,7 +148,8 @@ public class RegisterDialog extends Abst
country = WebSession.get().getBrowserLocale().getCountry();
}
- public void onOpen(AjaxRequestTarget target) {
+ @Override
+ protected void onOpen(IPartialPageRequestHandler handler) {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
String baseURL = cfgDao.getBaseUrl();
sendEmailAtRegister = 1 ==
cfgDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
@@ -162,7 +163,7 @@ public class RegisterDialog extends Abst
}
confirmRegistration.setModelObject(Application.getString(messageCode));
reset();
- target.add(form);
+ handler.add(form);
}
@Override
