TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Don't open new page for ext wiki on same repository (#20725)

Browse source 
- When the external wiki has been set to a file on the repository, don't
open the page on a tab.
- Resolves #20657
This commit is contained in:
Gusted 2022-08-20 16:47:04 +02:00 • committed by GitHub
parent 8cceee4084
commit 3d52edc7a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/templates/helper.go
View file

@ -453,6 +453,7 @@ func NewFuncMap() []template.FuncMap {
} }
return items return items
}, },
"HasPrefix": strings.HasPrefix,
}} }}
} }

2
templates/repo/header.tmpl
View file

@ -206,7 +206,7 @@
{{end}} {{end}}
{{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}}
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}> <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}}>
{{svg "octicon-book"}} {{.locale.Tr "repo.wiki"}} {{svg "octicon-book"}} {{.locale.Tr "repo.wiki"}}
</a> </a>
{{end}} {{end}}