Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rdac50a337aaa7c3738d1ae81f2379d12e21ef70e --- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java (.../WebUtil.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java (.../WebUtil.java) (revision dac50a337aaa7c3738d1ae81f2379d12e21ef70e) @@ -1,29 +1,12 @@ package org.lamsfoundation.lams.util; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; -import java.util.HashMap; -import java.util.Map.Entry; - +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.Grouping; @@ -34,8 +17,22 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.w3c.dom.Document; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; +import java.util.HashMap; +import java.util.Map.Entry; /** * helper methods useful for servlets @@ -371,11 +368,7 @@ return url; } else { String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL); - if (url.charAt(0) == '/') { - return serverURL + url; - } else { - return serverURL + '/' + url; - } + return serverURL + url; } } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java =================================================================== diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rdac50a337aaa7c3738d1ae81f2379d12e21ef70e --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java (.../LearnerController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java (.../LearnerController.java) (revision dac50a337aaa7c3738d1ae81f2379d12e21ef70e) @@ -234,7 +234,7 @@ + learnerProgress.toString()); } - String url = "learning/" + activityMapping.getDisplayActivityAction(lessonID); + String url = "learning" + activityMapping.getDisplayActivityAction(lessonID); redirectToURL(response, url); FluxRegistry.emit(CommonConstants.LESSON_JOINED_SINK_NAME, new LearnerLessonJoinFluxItem(lessonID, userId)); @@ -417,7 +417,7 @@ String url = null; if (!toActivity.isFloating()) { - url = "/learning" + activityMapping.getDisplayActivityAction(lessonId); + url = "learning" + activityMapping.getDisplayActivityAction(lessonId); } else { url = activityMapping.getActivityURL(toActivity); }