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/02 16:34:36 UTC
svn commit: r1563636 - in /openmeetings:
branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/
trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/
trunk...
Author: solomax
Date: Sun Feb 2 15:34:36 2014
New Revision: 1563636
URL: http://svn.apache.org/r1563636
Log:
[OPENMEETINGS-891] setting age to current date in the GUI is removed (now set in API only)
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java?rev=1563636&r1=1563635&r2=1563636&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/User.java Sun Feb 2 15:34:36 2014
@@ -299,9 +299,7 @@ public class User implements Serializabl
}
public void setAge(Date age) {
- if (age == null)
- age = new Date();
- this.age = age;
+ this.age = age == null ? new Date() :age;
}
public Integer getAvailible() {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1563636&r1=1563635&r2=1563636&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Sun Feb 2 15:34:36 2014
@@ -204,7 +204,7 @@ public class RegisterDialog extends Abst
String baseURL = getBaseUrl() + redirectPage;
try {
getBean(IUserManager.class).registerUserInit(3, 1, 0, 1, login, password, lastName, firstName, email,
- new Date(), "" /* street */, "" /* additionalname */, "" /* fax */, "" /* zip */, state.getState_id(),
+ null /* age/birthday */, "" /* street */, "" /* additionalname */, "" /* fax */, "" /* zip */, state.getState_id(),
"" /* town */, lang.getLanguage_id(), true /* sendWelcomeMessage */,
Arrays.asList(getBean(ConfigurationDao.class).getConfValue("default_domain_id", Long.class, null)),
"" /* phone */, false, baseURL, sendConfirmation, TimeZone.getTimeZone(tzModel.getObject()),
Modified: openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java?rev=1563636&r1=1563635&r2=1563636&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java (original)
+++ openmeetings/trunk/singlewebapp/src/db/java/org/apache/openmeetings/db/entity/user/User.java Sun Feb 2 15:34:36 2014
@@ -299,9 +299,7 @@ public class User implements Serializabl
}
public void setAge(Date age) {
- if (age == null)
- age = new Date();
- this.age = age;
+ this.age = age == null ? new Date() :age;
}
public Integer getAvailible() {
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1563636&r1=1563635&r2=1563636&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Sun Feb 2 15:34:36 2014
@@ -204,7 +204,7 @@ public class RegisterDialog extends Abst
String baseURL = getBaseUrl() + redirectPage;
try {
getBean(IUserManager.class).registerUserInit(3, 1, 0, 1, login, password, lastName, firstName, email,
- new Date(), "" /* street */, "" /* additionalname */, "" /* fax */, "" /* zip */, state.getState_id(),
+ null /* age/birthday */, "" /* street */, "" /* additionalname */, "" /* fax */, "" /* zip */, state.getState_id(),
"" /* town */, lang.getLanguage_id(), true /* sendWelcomeMessage */,
Arrays.asList(getBean(ConfigurationDao.class).getConfValue("default_domain_id", Long.class, null)),
"" /* phone */, false, baseURL, sendConfirmation, TimeZone.getTimeZone(tzModel.getObject()),