Browse Source

workaround for reverse proxy, ssh, submodule

Matthias Pioch 9 years ago
parent
commit
78a4e71245
3 changed files with 13 additions and 4 deletions
  1. 3 0
      modules/base/template.go
  2. 8 2
      modules/git/submodule.go
  3. 2 2
      templates/repo/view_list.tmpl

+ 3 - 0
modules/base/template.go

@@ -141,6 +141,9 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
 	"AppName": func() string {
 		return setting.AppName
 	},
+	"AppUrl": func() string {
+		return setting.AppUrl
+	},
 	"AppSubUrl": func() string {
 		return setting.AppSubUrl
 	},

+ 8 - 2
modules/git/submodule.go

@@ -30,7 +30,7 @@ func NewSubModuleFile(c *Commit, refUrl, refId string) *SubModuleFile {
 }
 
 // RefUrl guesses and returns reference URL.
-func (sf *SubModuleFile) RefUrl() string {
+func (sf *SubModuleFile) RefUrl(appUrl string) string {
 	if sf.refUrl == "" {
 		return ""
 	}
@@ -51,8 +51,14 @@ func (sf *SubModuleFile) RefUrl() string {
 	i := strings.Index(url, "@")
 	j := strings.LastIndex(url, ":")
 	if i > -1 && j > -1 {
-		return "http://" + url[i+1:j] + "/" + url[j+1:]
+		// fix problem with reverse proxy works only with local server
+		if strings.Contains(appUrl,url[i+1:j]) {
+			return appUrl + url[j+1:]
+		} else {
+			return "http://" + url[i+1:j] + "/" + url[j+1:]
+		}
 	}
+
 	return url
 }
 

+ 2 - 2
templates/repo/view_list.tmpl

@@ -39,8 +39,8 @@
                     <span class="octicon octicon-file-submodule"></span>
                 </td>
                 <td class="name">
-                    {{if $commit.RefUrl}}
-                    <a href="{{$commit.RefUrl}}" class="text-truncate">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a>
+                    {{if $commit.RefUrl AppUrl}}
+                    <a href="{{$commit.RefUrl AppUrl}}" class="text-truncate">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl AppUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a>
                     {{else}}
                     {{$entry.Name}} @ {{ShortSha $commit.RefId}}
                     {{end}}