Skip to content

Commit a3007f8

Browse files
LEDfanLEDfan
committed
Fix #35540: update datatables
1 parent 174991d commit a3007f8

3 files changed

Lines changed: 50 additions & 24 deletions

File tree

‎pom.xml‎

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
<!-- Dependency versions -->
3434
<containerproxy.version>1.3.0-SNAPSHOT</containerproxy.version>
3535
<spring-boot.version>3.4.13</spring-boot.version>
36-
<datatables.version>1.13.5</datatables.version>
37-
<datatables-plugins.version>1.13.5</datatables-plugins.version>
38-
<datatables-buttons.version>2.4.1</datatables-buttons.version>
39-
<datatables-responsive.version>2.2.7</datatables-responsive.version>
36+
<datatables.version>2.3.4</datatables.version>
37+
<datatables-plugins.version>2.3.6</datatables-plugins.version>
38+
<datatables-buttons.version>3.1.2</datatables-buttons.version>
39+
<datatables-responsive.version>2.4.0</datatables-responsive.version>
4040
<handlebars.version>4.7.7</handlebars.version>
4141
<sqlite-jdbc.version>3.50.3.0</sqlite-jdbc.version>
4242
<commons-lang.version>3.18.0</commons-lang.version>
@@ -102,24 +102,49 @@
102102
<artifactId>spring-boot-starter-mail</artifactId>
103103
</dependency>
104104
<dependency>
105-
<groupId>org.webjars</groupId>
106-
<artifactId>datatables</artifactId>
105+
<groupId>org.webjars.npm</groupId>
106+
<artifactId>datatables.net-bs</artifactId>
107107
<version>${datatables.version}</version>
108+
<scope>compile</scope>
109+
<exclusions>
110+
<exclusion>
111+
<groupId>org.webjars.npm</groupId>
112+
<artifactId>jquery</artifactId>
113+
</exclusion>
114+
</exclusions>
108115
</dependency>
109116
<dependency>
110-
<groupId>org.webjars</groupId>
111-
<artifactId>datatables-plugins</artifactId>
117+
<groupId>org.webjars.npm</groupId>
118+
<artifactId>datatables.net-plugins</artifactId>
112119
<version>${datatables-plugins.version}</version>
120+
<exclusions>
121+
<exclusion>
122+
<groupId>org.webjars.npm</groupId>
123+
<artifactId>jquery</artifactId>
124+
</exclusion>
125+
</exclusions>
113126
</dependency>
114127
<dependency>
115-
<groupId>org.webjars</groupId>
116-
<artifactId>datatables-buttons</artifactId>
128+
<groupId>org.webjars.npm</groupId>
129+
<artifactId>datatables.net-buttons-bs</artifactId>
117130
<version>${datatables-buttons.version}</version>
131+
<exclusions>
132+
<exclusion>
133+
<groupId>org.webjars.npm</groupId>
134+
<artifactId>jquery</artifactId>
135+
</exclusion>
136+
</exclusions>
118137
</dependency>
119138
<dependency>
120-
<groupId>org.webjars</groupId>
121-
<artifactId>datatables-responsive</artifactId>
139+
<groupId>org.webjars.npm</groupId>
140+
<artifactId>datatables.net-responsive-bs</artifactId>
122141
<version>${datatables-responsive.version}</version>
142+
<exclusions>
143+
<exclusion>
144+
<groupId>org.webjars.npm</groupId>
145+
<artifactId>jquery</artifactId>
146+
</exclusion>
147+
</exclusions>
123148
</dependency>
124149
<dependency>
125150
<groupId>org.webjars</groupId>

‎src/main/java/eu/openanalytics/shinyproxy/controllers/AdminController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,8 @@ private String getInstanceName(Proxy proxy) {
245245

246246
private final static Map<String, String> LOCALE_TO_DATATABLE_LANGUAGE = Map.of(
247247
"nl", "nl-NL.json",
248-
"fr", "fr-FR.json"
248+
"fr", "fr-FR.json",
249+
"es", "es-ES.json"
249250
);
250251

251252
private String getDataTableLanguageUrl() {
@@ -257,7 +258,7 @@ private String getDataTableLanguageUrl() {
257258
if (file == null) {
258259
return ""; // fallback to en
259260
}
260-
return contextPathHelper.withoutEndingSlash() + "/webjars/datatables-plugins/1.13.5/i18n/" + file;
261+
return contextPathHelper.withoutEndingSlash() + "/webjars/datatables.net-plugins/2.3.6/i18n/" + file;
261262
}
262263

263264
}

‎src/main/resources/templates/admin.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
<link media="screen" rel="stylesheet" th:href="@{${resourcePrefix} + ${bootstrapCss}}"/>
3232
<link media="screen" rel="stylesheet" th:href="@{${resourcePrefix} + '/css/default.css'}"/>
3333
<link media="screen" rel="stylesheet"
34-
th:href="@{${resourcePrefix} + '/webjars/datatables/1.13.5/css/dataTables.bootstrap.min.css'}"/>
34+
th:href="@{${resourcePrefix} + '/webjars/datatables.net-bs/2.3.4/css/dataTables.bootstrap.min.css'}"/>
3535
<link media="screen" rel="stylesheet"
36-
th:href="@{${resourcePrefix} + '/webjars/datatables-buttons/2.4.1/css/buttons.bootstrap.min.css'}">
36+
th:href="@{${resourcePrefix} + '/webjars/datatables.net-buttons-bs/3.1.2/css/buttons.bootstrap.min.css'}">
3737
<link media="screen" rel="stylesheet"
38-
th:href="@{${resourcePrefix} + '/webjars/datatables-responsive/2.2.7/css/responsive.bootstrap.min.css'}">
38+
th:href="@{${resourcePrefix} + '/webjars/datatables.net-responsive-bs/2.4.0/css/responsive.bootstrap.min.css'}">
3939
<script th:src="@{${resourcePrefix} + ${jqueryJs}}"></script>
4040
<script th:src="@{${resourcePrefix} + ${bootstrapJs}}"></script>
4141
<script th:src="@{${resourcePrefix} + ${handlebars}}"></script>
@@ -159,13 +159,13 @@
159159

160160
<div th:replace="~{fragments/modal :: modal}"></div>
161161

162-
<script th:src="@{/webjars/datatables/1.13.5/js/jquery.dataTables.min.js}"></script>
163-
<script th:src="@{/webjars/datatables/1.13.5/js/dataTables.bootstrap.min.js}"></script>
164-
<script th:src="@{/webjars/datatables-buttons/2.4.1/js/dataTables.buttons.min.js}"></script>
165-
<script th:src="@{/webjars/datatables-buttons/2.4.1/js/buttons.bootstrap.min.js}"></script>
166-
<script th:src="@{/webjars/datatables-buttons/2.4.1/js/buttons.html5.min.js}"></script>
167-
<script th:src="@{/webjars/datatables-responsive/2.2.7/js/dataTables.responsive.min.js}"></script>
168-
<script th:src="@{/webjars/datatables-responsive/2.2.7/js/responsive.bootstrap.min.js}"></script>
162+
<script th:src="@{${resourcePrefix} +'/webjars/datatables.net/2.3.4/js/dataTables.min.js'}"></script>
163+
<script th:src="@{${resourcePrefix} +'/webjars/datatables.net-bs/2.3.4/js/dataTables.bootstrap.min.js'}"></script>
164+
<script th:src="@{${resourcePrefix} +'/webjars/datatables.net-buttons/3.1.2/js/dataTables.buttons.min.js'}"></script>
165+
<script th:src="@{${resourcePrefix} +'/webjars/datatables.net-buttons-bs/3.1.2/js/buttons.bootstrap.min.js'}"></script>
166+
<script th:src="@{${resourcePrefix} +'/webjars/datatables.net-buttons/3.1.2/js/buttons.html5.min.js'}"></script>
167+
<script th:src="@{${resourcePrefix} +'/webjars/datatables.net-responsive/3.0.6/js/dataTables.responsive.min.js'}"></script>
168+
<script th:src="@{${resourcePrefix} +'/webjars/datatables.net-responsive-bs/2.4.0/js/responsive.bootstrap.min.js'}"></script>
169169

170170
<script th:if="${subPage == 'main'}" th:inline="javascript" type="text/javascript">
171171
$(window).on('load', function () {

0 commit comments

Comments
 (0)