Skip to content
Snippets Groups Projects
Commit 8ccab132 authored by Ruben Backx's avatar Ruben Backx :coffee:
Browse files

Merge branch 'development' into 'main'

Deploy fix

See merge request !418
parents c11fd2e5 f3a37ebd
No related branches found
No related tags found
1 merge request!418Deploy fix
Pipeline #1233921 passed
...@@ -8,9 +8,9 @@ version = "2.2.5" ...@@ -8,9 +8,9 @@ version = "2.2.5"
val javaVersion = JavaVersion.VERSION_21 val javaVersion = JavaVersion.VERSION_21
val labradoorVersion = "1.6.14" val labradoorVersion = "1.6.5"
val libradorVersion = "1.4.1" val libradorVersion = "1.4.1"
val chihuahUIVersion = "1.2.2" val chihuahUIVersion = "1.2.4"
val guavaVersion = "32.1.1-jre" val guavaVersion = "32.1.1-jre"
val modelMapperVersion = "3.1.0" val modelMapperVersion = "3.1.0"
val jQueryVersion = "3.6.2" val jQueryVersion = "3.6.2"
......
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
name="programs" name="programs"
multiple multiple
data-select data-select
data-controls
data-search
required> required>
<option <option
th:each="program : ${programs}" th:each="program : ${programs}"
......
...@@ -88,6 +88,8 @@ ...@@ -88,6 +88,8 @@
name="programs" name="programs"
multiple multiple
data-select data-select
data-controls
data-search
required> required>
<option <option
th:each="program : ${programs}" th:each="program : ${programs}"
...@@ -109,9 +111,7 @@ ...@@ -109,9 +111,7 @@
th:each="period: ${periods}" th:each="period: ${periods}"
th:value="${period.id}" th:value="${period.id}"
th:text="${period.name}" th:text="${period.name}"
th:selected="${param.academicPeriods == null th:selected="${param.academicPeriods != null && param.academicPeriods.contains(period.id.toString())}" />
|| #arrays.contains(
#strings.arraySplit(param.academicPeriods,','), period.id.toString())}" />
</select> </select>
</div> </div>
<div class="flex vertical gap-1"> <div class="flex vertical gap-1">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment