From ef1cbf4deea565f7c384e7e7a9fded0a60e13674 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 7 Oct 2014 20:28:37 +0200
Subject: [PATCH] use base uri from request for git quick repository view, see
 issue #631

---
 .../java/sonia/scm/web/GitRepositoryViewer.java | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
index aff932350d..1c01ef2fc1 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
@@ -44,7 +44,6 @@ import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sonia.scm.config.ScmConfiguration;
 import sonia.scm.repository.Branch;
 import sonia.scm.repository.Branches;
 import sonia.scm.repository.Changeset;
@@ -60,6 +59,7 @@ import sonia.scm.template.TemplateEngineFactory;
 import sonia.scm.url.RepositoryUrlProvider;
 import sonia.scm.url.UrlProvider;
 import sonia.scm.url.UrlProviderFactory;
+import sonia.scm.util.HttpUtil;
 import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -84,7 +84,8 @@ public class GitRepositoryViewer
   public static final String MIMETYPE_HTML = "text/html";
 
   /** Field description */
-  public static final String RESOURCE_GITINDEX = "/sonia/scm/git.index.mustache";
+  public static final String RESOURCE_GITINDEX =
+    "/sonia/scm/git.index.mustache";
 
   /** Field description */
   private static final int CHANGESET_PER_BRANCH = 10;
@@ -103,16 +104,13 @@ public class GitRepositoryViewer
    *
    * @param templateEngineFactory
    * @param repositoryServiceFactory
-   * @param configuration
    */
   @Inject
   public GitRepositoryViewer(TemplateEngineFactory templateEngineFactory,
-    RepositoryServiceFactory repositoryServiceFactory,
-    ScmConfiguration configuration)
+    RepositoryServiceFactory repositoryServiceFactory)
   {
     this.templateEngineFactory = templateEngineFactory;
     this.repositoryServiceFactory = repositoryServiceFactory;
-    this.configuration = configuration;
   }
 
   //~--- methods --------------------------------------------------------------
@@ -134,7 +132,9 @@ public class GitRepositoryViewer
     throws RepositoryException, IOException
   {
 
-    String baseUrl = configuration.getBaseUrl();
+    String baseUrl = HttpUtil.getCompleteUrl(request);
+
+    logger.trace("render git repository quick view with base url {}", baseUrl);
 
     UrlProvider urlProvider = UrlProviderFactory.createUrlProvider(baseUrl,
                                 UrlProviderFactory.TYPE_WUI);
@@ -452,9 +452,6 @@ public class GitRepositoryViewer
 
   //~--- fields ---------------------------------------------------------------
 
-  /** Field description */
-  private final ScmConfiguration configuration;
-
   /** Field description */
   private final RepositoryServiceFactory repositoryServiceFactory;