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 2020/04/28 15:02:24 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2305] proper
fix is commented for now
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 f70bdf9 [OPENMEETINGS-2305] proper fix is commented for now
f70bdf9 is described below
commit f70bdf93d8d128967b9d37203d9a437fe3ef2779
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Apr 28 22:02:04 2020 +0700
[OPENMEETINGS-2305] proper fix is commented for now
---
.../java/org/apache/openmeetings/web/common/GeneralUserForm.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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 444316d..ca8153a 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
@@ -55,6 +55,7 @@ public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
private final RequiredTextField<String> email = new RequiredTextField<>("address.email");
private final List<GroupUser> grpUsers = new ArrayList<>();
+ private final AjaxOmDatePicker bday = new AjaxOmDatePicker("age");
private final boolean isAdminForm;
@SpringBean
private GroupDao groupDao;
@@ -95,8 +96,6 @@ public class GeneralUserForm extends Form<User> {
add(new DropDownChoice<>("timeZoneId", AVAILABLE_TIMEZONES));
add(new LanguageDropDown("languageId"));
add(new TextField<String>("address.phone"));
- final AjaxOmDatePicker bday = new AjaxOmDatePicker("age");
- //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"));
@@ -140,6 +139,9 @@ public class GeneralUserForm extends Form<User> {
}
public void updateModelObject(User u, boolean isAdminForm) {
+ /*bday.getConfig()
+ .withDate(u.getAge() == null ? LocalDate.now() : u.getAge())
+ .withMaxDate(LocalDate.now());*/
grpUsers.clear();
grpUsers.addAll(u.getGroupUsers());
if (isAdminForm) {