diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18817c327fcbd18a5687233edab6ead7648afac2..3b4eeb31c2f394b091410bacfb71540722de5cb3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,3 +27,17 @@ pages: allow_failure: true - if: $CI_COMMIT_BRANCH == "main" allow_failure: true + +# Temporarily disabled as we are changing the database structure a lot + +mysql_migration: + rules: + - when: never + +mysql_cross_migration: + rules: + - when: never + +mysql_test: + rules: + - when: never diff --git a/build.gradle.kts b/build.gradle.kts index 94771ba8c88a97dce61b9838ed8ad76967dc2f23..6b6a28d4c8c71bd8d1624c0b4416d7e29fd270ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ version = "2.2.5" val javaVersion = JavaVersion.VERSION_21 -val labradoorVersion = "1.6.14" +val labradoorVersion = "1.6.5" val libradorVersion = "1.4.1" val chihuahUIVersion = "1.2.4" val guavaVersion = "32.1.1-jre" diff --git a/src/main/resources/templates/application/all_flexdelft.html b/src/main/resources/templates/application/all_flexdelft.html index e8c8e06c4fe96afc1b7d82e92fa042a5dcdb4392..f9922d37d232f9fff63d5608bc9b5f875131425f 100644 --- a/src/main/resources/templates/application/all_flexdelft.html +++ b/src/main/resources/templates/application/all_flexdelft.html @@ -111,9 +111,7 @@ th:each="period: ${periods}" th:value="${period.id}" th:text="${period.name}" - th:selected="${param.academicPeriods == null - || #arrays.contains( - #strings.arraySplit(param.academicPeriods,','), period.id.toString())}" /> + th:selected="${param.academicPeriods != null && param.academicPeriods.contains(period.id.toString())}" /> </select> </div> <div class="flex vertical gap-1">