You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/09/01 10:16:44 UTC
[isis] branch ISIS-3197 updated: ISIS-3197: fixes js compile issue (?)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3197
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3197 by this push:
new 658c7e7771 ISIS-3197: fixes js compile issue (?)
658c7e7771 is described below
commit 658c7e77712df615c3fe1721fe89e8ba04f85fbb
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Sep 1 11:16:37 2022 +0100
ISIS-3197: fixes js compile issue (?)
---
.../common/datatables/DatatablesJavaScriptResourceReferenceInit.java | 2 +-
.../datatables/{dataTables.init.js => dataTables.init.js.template} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
index c44b05a808..1174248df7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/DatatablesJavaScriptResourceReferenceInit.java
@@ -61,7 +61,7 @@ public class DatatablesJavaScriptResourceReferenceInit extends JavaScriptContent
}
private static String readScript() {
- return asString(new ClassPathResource("dataTables.init.js", DatatablesJavaScriptResourceReferenceInit.class));
+ return asString(new ClassPathResource("dataTables.init.js.template", DatatablesJavaScriptResourceReferenceInit.class));
}
private static String asString(Resource resource) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/dataTables.init.js b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/dataTables.init.js.template
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/dataTables.init.js
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/datatables/dataTables.init.js.template