Merge remote-tracking branch 'origin/maven/fixes/9.1' into maven/rele…

…ase/9.1
edu-sharing · Nov 8, 2024 · d9b9759 · d9b9759
2 parents edc895e + d6db887
commit d9b9759
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/...core/src/main/java/org/edu_sharing/repository/server/jobs/quartz/NodeObjectReportJob.java b/...core/src/main/java/org/edu_sharing/repository/server/jobs/quartz/NodeObjectReportJob.java
@@ -128,12 +128,11 @@ protected void executeInternal(JobExecutionContext jobExecutionContext) throws J
     }
 
     private Void createStats() {
-        LocalDate now = LocalDate.now();
-        LocalDate to = now.minusDays(1);
-
+        LocalDate to = LocalDate.now();
         if (customDate != null) {
             to = customDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
         }
+        to = to.minusDays(1);
 
         LocalDate from = to.withDayOfMonth(1);
         switch (type) {
@@ -195,30 +194,9 @@ private String generateFilename(LocalDate from, LocalDate to) {
         StringBuilder sb = new StringBuilder(filename);
         if (appendDate) {
             sb.append("_");
-            switch (type) {
-                case Yearly:
-                    sb.append(from.format(DateTimeFormatter.ofPattern(("yyyy"))));
-                    if(to.getMonthValue() != 12 && to.getDayOfMonth() != to.lengthOfMonth()){
-                        sb.append("_interim");
-                    }
-                    break;
-                case Quarterly:
-                    sb.append(from.format(DateTimeFormatter.ofPattern(("yyyy"))));
-                    sb.append("-Q");
-                    sb.append(to.getMonthValue() / 3);
-                    if(to.getMonth().firstMonthOfQuarter().getValue() + 3 != to.getMonthValue() && to.getDayOfMonth() != to.lengthOfMonth()){
-                        sb.append("_interim");
-                    }
-                    break;
-                case Monthly:
-                    sb.append(from.format(DateTimeFormatter.ofPattern(("yyyy-MM"))));
-                    if(to.getDayOfMonth() != to.lengthOfMonth()){
-                        sb.append("_interim");
-                    }
-                    break;
-                default:
-                    throw new NotImplementedException(type.name());
-            }
+            sb.append(from.format(DateTimeFormatter.ofPattern(("yyMMdd"))));
+            sb.append("-");
+            sb.append(to.format(DateTimeFormatter.ofPattern(("yyMMdd"))));
         }
 
         sb.append(".csv");

diff --git a/...ices/core/src/main/java/org/edu_sharing/repository/server/rendering/RenderingServlet.java b/...ices/core/src/main/java/org/edu_sharing/repository/server/rendering/RenderingServlet.java
@@ -90,7 +90,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
                 }
 
                 response = renderingService.getDetails(ApplicationInfoList.getHomeRepository().getAppId(), node_id, version,DEFAULT_DISPLAY_MODE, params).getDetails();
-                response = response.replace("{{{LMS_INLINE_HELPER_SCRIPT}}}", URLHelper.getNgRenderNodeUrl(node_id,version)+"?");
+                response = response.replace("{{{LMS_INLINE_HELPER_SCRIPT}}}", URLHelper.getNgRenderNodeUrl(node_id,version,true)+"?");
                 // add nonce to render styles
                 response = response.replace("<style", "<style nonce=\"" +SecurityHeadersFilter.ngCspNonce.get() + "\"");
                 TrackingServiceFactory.getTrackingService().trackActivityOnNode(new NodeRef(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, node_id), null, TrackingService.EventType.VIEW_MATERIAL_EMBEDDED);