From 0968145160899ba39fcccc5106acad0cc0ca3b9a Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Mon, 4 Jun 2018 06:37:31 -0400 Subject: [PATCH] GUACAMOLE-422: Revert weird addition of timezone field in JDBC module. --- .../org/apache/guacamole/auth/jdbc/user/ModeledUser.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java index a2e0fadbb..b7924edd9 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/user/ModeledUser.java @@ -113,8 +113,7 @@ public class ModeledUser extends ModeledPermissions implements User { new TextField(User.Attribute.FULL_NAME), new EmailField(User.Attribute.EMAIL_ADDRESS), new TextField(User.Attribute.ORGANIZATION), - new TextField(User.Attribute.ORGANIZATIONAL_ROLE), - new TimeZoneField(TIMEZONE_ATTRIBUTE_NAME) + new TextField(User.Attribute.ORGANIZATIONAL_ROLE) )); /** @@ -350,9 +349,6 @@ public class ModeledUser extends ModeledPermissions implements User { // Set role attribute attributes.put(User.Attribute.ORGANIZATIONAL_ROLE, getModel().getOrganizationalRole()); - // Set timezone attribute - attributes.put(TIMEZONE_ATTRIBUTE_NAME, getModel().getTimeZone()); - } /**