Skip to content

Commit bc767db

Browse files
GustedSysoev, Vladimir
Gusted
authored and
Sysoev, Vladimir
committed
Don't open new page for ext wiki on same repository (go-gitea#20725)
- When the external wiki has been set to a file on the repository, don't open the page on a tab. - Resolves go-gitea#20657
1 parent af7cd51 commit bc767db

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

modules/templates/helper.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ func NewFuncMap() []template.FuncMap {
453453
}
454454
return items
455455
},
456+
"HasPrefix": strings.HasPrefix,
456457
}}
457458
}
458459

templates/repo/header.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
{{end}}
207207

208208
{{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}}
209-
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
209+
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if and (.Permission.CanRead $.UnitTypeExternalWiki) (not (HasPrefix ((.Repository.MustGetUnit $.UnitTypeExternalWiki).ExternalWikiConfig.ExternalWikiURL) (.Repository.HTMLURL)))}} target="_blank" rel="noopener noreferrer" {{end}}>
210210
{{svg "octicon-book"}} {{.locale.Tr "repo.wiki"}}
211211
</a>
212212
{{end}}

0 commit comments

Comments
 (0)