From 12a325ee037ed38872a3fad8b0d7b5e956eb65dc Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Thu, 21 Sep 2023 21:32:18 +0200 Subject: [PATCH] corrected username check and dropdown size, see #57 --- build.gradle | 2 +- .../module/registration/RegistrationRepository.java | 10 +++++----- src/main/resources/static/css/style.css | 5 +++++ src/main/resources/templates/template.html | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 98ab1b6..f002612 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { } group = 'de.jottyfan.camporganizer' -version = '0.5.6' +version = '0.5.7' description = """CampOrganizer2""" diff --git a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java index dad1224..c78b1cc 100644 --- a/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java +++ b/src/main/java/de/jottyfan/camporganizer/module/registration/RegistrationRepository.java @@ -94,7 +94,7 @@ public class RegistrationRepository { SelectConditionStep sql = jooq // @formatter:off .selectFrom(T_PROFILE) - .where(T_PROFILE.USERNAME.eq(login)); + .where(DSL.lower(T_PROFILE.USERNAME).eq(login)); // @formatter:on LOGGER.debug(sql); return sql.fetch().size() < 1; @@ -111,9 +111,9 @@ public class RegistrationRepository { LambdaResultWrapper lrw = new LambdaResultWrapper(); jooq.transaction(t -> { if (bean.getLogin() != null && !bean.getLogin().isEmpty()) { - Boolean loginNotYetInUse = isLoginNotYetInUse(bean.getLogin()); + Boolean loginNotYetInUse = isLoginNotYetInUse(bean.getLogin().toLowerCase()); if (bean.getRegisterInKeycloak() && !loginNotYetInUse) { - throw new DataAccessException("login already in use: " + bean.getLogin()); + throw new DataAccessException("login already in use: " + bean.getLogin().toLowerCase()); } Integer fkProfile = null; if (loginNotYetInUse) { @@ -127,7 +127,7 @@ public class RegistrationRepository { T_PROFILE.PASSWORD, T_PROFILE.DUEDATE, T_PROFILE.UUID) - .values(bean.getForename(), bean.getSurname(), bean.getLogin(), oldPassword, LocalDateTime.now().plus(356, ChronoUnit.DAYS), UUID.nameUUIDFromBytes(bean.getLogin().getBytes()).toString()) + .values(bean.getForename(), bean.getSurname(), bean.getLogin().toLowerCase(), oldPassword, LocalDateTime.now().plus(356, ChronoUnit.DAYS), UUID.nameUUIDFromBytes(bean.getLogin().getBytes()).toString()) .returning(T_PROFILE.PK); // @formatter:on LOGGER.debug(sql1.toString()); @@ -147,7 +147,7 @@ public class RegistrationRepository { // @formatter:off .select(T_PROFILE.PK) .from(T_PROFILE) - .where(T_PROFILE.USERNAME.eq(bean.getLogin())); + .where(DSL.lower(T_PROFILE.USERNAME).eq(bean.getLogin().toLowerCase())); // @formatter:on LOGGER.debug(sql1.toString()); fkProfile = sql1.fetchOne().get(T_PROFILE.PK); diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index 5662087..173638a 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -437,3 +437,8 @@ div { .beforetext { margin-right: 8px; } + +.visibledropdown { + max-height: 80vh; + overflow: auto; +} diff --git a/src/main/resources/templates/template.html b/src/main/resources/templates/template.html index bede989..34b01f4 100644 --- a/src/main/resources/templates/template.html +++ b/src/main/resources/templates/template.html @@ -38,7 +38,7 @@
  • Verein
  • -