more replacements for getRelativePathPrefixToContextRoot

diff --git a/src/main/java/com/gitblit/wicket/panels/BasePanel.java b/src/main/java/com/gitblit/wicket/panels/BasePanel.java
index 0f136ffd93c25a1b29b1310ba4c18e9337c64f7c..f46e10b3870237b1fc7c8fc8acdac6f55015a62b 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BasePanel.java
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
 \r
 import com.gitblit.Constants;\r
 import com.gitblit.Keys;\r
+import com.gitblit.utils.GitBlitRequestUtils;\r
 import com.gitblit.utils.TimeUtils;\r
 import com.gitblit.wicket.GitBlitWebApp;\r
 import com.gitblit.wicket.GitBlitWebSession;\r
@@ -56,7 +57,7 @@ public abstract class BasePanel extends Panel {
        }\r
 \r
        protected String getContextUrl() {\r
-               return getRequest().getRelativePathPrefixToContextRoot();\r
+               return GitBlitRequestUtils.getRelativePathPrefixToContextRoot();\r
        }\r
 \r
        protected TimeZone getTimeZone() {\r

diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
index bc5cd8dfe7468d4c3a30701c3b344fe060e1376e..07cdafd56053a3c69ec8a6a05ef644b060ec4210 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
@@ -148,7 +148,7 @@ public class BranchesPanel extends BasePanel {
                                        fragment.add(new ExternalLink("raw", rawUrl));\r
                                        fragment.add(new BookmarkablePageLink<Void>("metrics", MetricsPage.class, shortUniqRef));\r
                                        fragment.add(new ExternalLink("syndication", SyndicationServlet.asLink(\r
-                                                       getRequest().getRelativePathPrefixToContextRoot(), model.name,\r
+                                                       GitBlitRequestUtils.getRelativePathPrefixToContextRoot(), model.name,\r
                                                        Repository.shortenRefName(entry.getName()), 0)));\r
                                        if (showDelete) {\r
                                                fragment.add(createDeleteBranchLink(model, entry));\r

diff --git a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
index 363708420d29db8c2b6fdfd8b40b9b112c3d575a..a681e6ce0743abf2bce46c58653cb7015a68ab86 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
@@ -32,6 +32,7 @@ import org.eclipse.jgit.lib.Repository;
 \r
 import com.gitblit.models.RefModel;\r
 import com.gitblit.servlet.RawServlet;\r
+import com.gitblit.utils.GitBlitRequestUtils;\r
 import com.gitblit.utils.JGitUtils;\r
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.WicketUtils;\r
@@ -115,7 +116,7 @@ public class TagsPanel extends BasePanel {
                                                        .newObjectParameter(repositoryName, entry.getReferencedObjectId()\r
                                                                        .getName())));\r
 \r
-                                       String contextUrl = RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot();\r
+                                       String contextUrl = GitBlitRequestUtils.getRelativePathPrefixToContextRoot();\r
                                        String rawUrl = RawServlet.asLink(contextUrl, repositoryName, entry.displayName,\r
                                                        entry.getReferencedObjectId().getName());\r
                                        fragment.add(new ExternalLink("raw", rawUrl));\r