diff options
| -rw-r--r-- | modules/base/template.go | 3 | ||||
| -rw-r--r-- | modules/git/submodule.go | 7 | ||||
| -rw-r--r-- | templates/repo/view_list.tmpl | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/modules/base/template.go b/modules/base/template.go index a93d20ad86..f5f567aded 100644 --- a/modules/base/template.go +++ b/modules/base/template.go @@ -141,9 +141,6 @@ 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 }, diff --git a/modules/git/submodule.go b/modules/git/submodule.go index 1291e112b9..0b8efc26dc 100644 --- a/modules/git/submodule.go +++ b/modules/git/submodule.go @@ -6,6 +6,7 @@ package git import ( "strings" + "github.com/gogits/gogs/modules/setting" ) type SubModule struct { @@ -30,7 +31,7 @@ func NewSubModuleFile(c *Commit, refUrl, refId string) *SubModuleFile { } // RefUrl guesses and returns reference URL. -func (sf *SubModuleFile) RefUrl(appUrl string) string { +func (sf *SubModuleFile) RefUrl() string { if sf.refUrl == "" { return "" } @@ -52,8 +53,8 @@ func (sf *SubModuleFile) RefUrl(appUrl string) string { j := strings.LastIndex(url, ":") if i > -1 && 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:] + if strings.Contains(setting.AppUrl,url[i+1:j]) { + return setting.AppUrl + url[j+1:] } else { return "http://" + url[i+1:j] + "/" + url[j+1:] } diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index bebac1ea43..d3303193f8 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -39,8 +39,8 @@ <span class="octicon octicon-file-submodule"></span> </td> <td class="name"> - {{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> + {{if $commit.RefUrl}} + <a href="{{$commit.RefUrl}}" class="text-truncate">{{$entry.Name}}</a> @ <a href="{{$commit.RefUrl}}/commit/{{$commit.RefId}}">{{ShortSha $commit.RefId}}</a> {{else}} {{$entry.Name}} @ {{ShortSha $commit.RefId}} {{end}} |