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

* Don't open new page for ext wiki on same repository (#20725) - Backport of #20725 - When the external wiki has been set to a file on the repository, don't open the page on a tab. - Resolves #20657 * Gofmt * Fix line Co-authored-by: zeripath <art27@cantab.net>
go-gitea · Aug 22, 2022 · c0754e9 · c0754e9
1 parent bf41958
commit c0754e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
@@ -454,6 +454,7 @@ func NewFuncMap() []template.FuncMap {
 			}
 			return items
 		},
+		"HasPrefix": strings.HasPrefix,
 	}}
 }
 

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
@@ -206,7 +206,7 @@
 				{{end}}
 
 				{{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"}} {{.i18n.Tr "repo.wiki"}}
 					</a>
 				{{end}}
-Original file line number
+Diff line change
@@ Expand Up / @@ -454,6 +454,7 @@ func NewFuncMap() []template.FuncMap { @@
     			}
     			return items
     		},
+    		"HasPrefix": strings.HasPrefix,
     	}}
     }
@@ Expand Down @@