From a6121361e7e7013f4f78f949b2b6b8bef2097851 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Mon, 9 Dec 2019 14:54:58 +0100
Subject: [PATCH] OO-4409: Point help url of pre releases to the next major
release
---
.../core/commons/services/help/ConfluenceHelper.java | 3 ++-
.../commons/services/help/ConfluenceHelperTest.java | 12 ++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java b/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java
index 8e189dcd2b0..f826f5edc3b 100644
--- a/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java
+++ b/src/main/java/org/olat/core/commons/services/help/ConfluenceHelper.java
@@ -120,7 +120,8 @@ public class ConfluenceHelper {
protected static final String generateSpace(String version, Locale locale) {
StringBuilder sb = new StringBuilder();
sb.append("/OO");
-
+
+ version = version.replace("pre", "0");
int firstPointIndex = version.indexOf('.');
if (firstPointIndex > 0) {
sb.append(version.substring(0, firstPointIndex));
diff --git a/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java b/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java
index cd53e477603..8698b4cc71c 100644
--- a/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java
+++ b/src/test/java/org/olat/core/commons/services/help/ConfluenceHelperTest.java
@@ -49,5 +49,17 @@ public class ConfluenceHelperTest {
String url4 = ConfluenceHelper.generateSpace("11a", Locale.ENGLISH);
Assert.assertNotNull(url4);
Assert.assertTrue(url4.startsWith("/OO110EN/"));
+
+ String url5pre0a = ConfluenceHelper.generateSpace("15.pre.0.a", Locale.ENGLISH);
+ Assert.assertNotNull(url5pre0a);
+ Assert.assertTrue(url5pre0a.startsWith("/OO150EN/"));
+
+ String url15pre1 = ConfluenceHelper.generateSpace("15.pre.1", Locale.ENGLISH);
+ Assert.assertNotNull(url15pre1);
+ Assert.assertTrue(url15pre1.startsWith("/OO150EN/"));
+
+ String url15pre = ConfluenceHelper.generateSpace("15.pre", Locale.ENGLISH);
+ Assert.assertNotNull(url15pre);
+ Assert.assertTrue(url15pre.startsWith("/OO150EN/"));
}
}
--
GitLab