[openmeetings] branch master updated: [OPENMEETINGS-2305] maxDate is temporary removed from bday

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 3f76501  [OPENMEETINGS-2305] maxDate is temporary removed from bday
3f76501 is described below

commit 3f76501dd11366dead921a9a8f7734d40e7e6c7b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Apr 27 22:38:08 2020 +0700

    [OPENMEETINGS-2305] maxDate is temporary removed from bday
---
 .../main/java/org/apache/openmeetings/web/common/GeneralUserForm.html | 4 +---
 .../main/java/org/apache/openmeetings/web/common/GeneralUserForm.java | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
index b998656..73a9b55 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
@@ -51,9 +51,7 @@
 	</div>
 	<div class="formelement">
 		<label wicket:for="age" class="col-3 text-right"><wicket:message key="138" /></label>
-		<div class="d-inline-block col-8 p-0">
-			<input type="text" class="date time picker" wicket:id="age"/>
-		</div>
+		<div class="d-inline-block col-8 p-0"><span class="date time picker" wicket:id="age"></span></div>
 	</div>
 	<div class="formelement">
 		<label wicket:for="address.street" class="col-3 text-right"><wicket:message key="139" /></label>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index f8da8da..444316d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -24,7 +24,6 @@ import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES;
 import static org.apache.openmeetings.web.app.WebSession.getRights;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
 
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -66,6 +65,7 @@ public class GeneralUserForm extends Form<User> {
 		super(id, model);
 		this.isAdminForm = isAdminForm;
 		updateModelObject(getModelObject(), isAdminForm);
+		setOutputMarkupId(true);
 	}
 
 	@Override
@@ -96,7 +96,7 @@ public class GeneralUserForm extends Form<User> {
 		add(new LanguageDropDown("languageId"));
 		add(new TextField<String>("address.phone"));
 		final AjaxOmDatePicker bday = new AjaxOmDatePicker("age");
-		bday.getConfig().withMaxDate(LocalDate.now());
+		//bday.getConfig().withMaxDate(LocalDate.now()); // FIXME TODO not working so far
 		add(bday);
 		add(new TextField<String>("address.street"));
 		add(new TextField<String>("address.additionalname"));