Redirect to release tag page if release can be visited

Author: lunny

routers/web/repo/release.go

@@ -157,13 +157,6 @@ func Releases(ctx *context.Context) {
 	ctx.Data["CanCreateBranch"] = false
 	ctx.Data["HideBranchesInDropdown"] = true
 
-	// repo/release_tag_header.tmpl will render sub menu depending on the different permission
-	if !ctx.Repo.CanRead(unit.TypeReleases) && ctx.Repo.CanRead(unit.TypeCode) {
-		if !shared.PrepareForRepoSubMenu(ctx) {
-			return
-		}
-	}
-
 	listOptions := db.ListOptions{
 		Page:     ctx.FormInt("page"),
 		PageSize: ctx.FormInt("limit"),
@@ -206,6 +199,11 @@ func Releases(ctx *context.Context) {
 
 // TagsList render tags list page
 func TagsList(ctx *context.Context) {
+	if ctx.Repo.CanRead(unit.TypeReleases) {
+		ctx.Redirect(fmt.Sprintf("%s/releases", ctx.Repo.RepoLink))
+		return
+	}
+
 	ctx.Data["PageIsTagList"] = true
 	ctx.Data["Title"] = ctx.Tr("repo.release.tags")
 	ctx.Data["IsViewBranch"] = false
@@ -215,11 +213,8 @@ func TagsList(ctx *context.Context) {
 	ctx.Data["HideBranchesInDropdown"] = true
 	ctx.Data["CanCreateRelease"] = ctx.Repo.CanWrite(unit.TypeReleases) && !ctx.Repo.Repository.IsArchived
 
-	// repo/release_tag_header.tmpl will render sub menu depending on the different permission
-	if !ctx.Repo.CanRead(unit.TypeReleases) && ctx.Repo.CanRead(unit.TypeCode) {
-		if !shared.PrepareForRepoSubMenu(ctx) {
-			return
-		}
+	if !shared.PrepareForRepoSubMenu(ctx) {
+		return
 	}
 
 	namePattern := ctx.FormTrim("q")

templates/repo/release_tag_header.tmpl

@@ -1,29 +1,23 @@
-{{$canReadReleases := $.Permission.CanRead ctx.Consts.RepoUnitTypeReleases}}
 {{$canReadCode := $.Permission.CanRead ctx.Consts.RepoUnitTypeCode}}
 
-{{if $canReadReleases}}
-	<div class="tw-flex">
-		<div class="tw-flex-1 tw-flex tw-items-center">
-			<h2 class="ui compact small menu small-menu-items">
-				<a class="{{if and .PageIsReleaseList (not .PageIsSingleTag)}}active {{end}}item" href="{{.RepoLink}}/releases">{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}}</a>
-				{{if $canReadCode}}
-					<a class="{{if or .PageIsTagList .PageIsSingleTag}}active {{end}}item" href="{{.RepoLink}}/tags">{{ctx.Locale.PrettyNumber .NumTags}} {{ctx.Locale.TrN .NumTags "repo.tag" "repo.tags"}}</a>
-				{{end}}
-			</h2>
-		</div>
-		{{if .EnableFeed}}
-			<a class="ui small button" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss">
-				{{svg "octicon-rss" 16}} {{ctx.Locale.Tr "rss_feed"}}
-			</a>
-		{{end}}
-		{{if and (not .PageIsTagList) .CanCreateRelease}}
-			<a class="ui small primary button" href="{{$.RepoLink}}/releases/new{{if .PageIsSingleTag}}?tag={{.TagName}}{{end}}">
-				{{ctx.Locale.Tr "repo.release.new_release"}}
-			</a>
-		{{end}}
+<div class="tw-flex">
+	<div class="tw-flex-1 tw-flex tw-items-center">
+		<h2 class="ui compact small menu small-menu-items">
+			<a class="{{if and .PageIsReleaseList (not .PageIsSingleTag)}}active {{end}}item" href="{{.RepoLink}}/releases">{{ctx.Locale.PrettyNumber .NumReleases}} {{ctx.Locale.TrN .NumReleases "repo.release" "repo.releases"}}</a>
+			{{if $canReadCode}}
+				<a class="{{if or .PageIsTagList .PageIsSingleTag}}active {{end}}item" href="{{.RepoLink}}/tags">{{ctx.Locale.PrettyNumber .NumTags}} {{ctx.Locale.TrN .NumTags "repo.tag" "repo.tags"}}</a>
+			{{end}}
+		</h2>
 	</div>
-	<div class="divider"></div>
-{{else if $canReadCode}}
-	{{/* if the "repo.releases" unit is disabled, only show the "commits / branches / tags" sub menu */}}
-	{{template "repo/sub_menu" .}}
-{{end}}
+	{{if .EnableFeed}}
+		<a class="ui small button" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss">
+			{{svg "octicon-rss" 16}} {{ctx.Locale.Tr "rss_feed"}}
+		</a>
+	{{end}}
+	{{if and (not .PageIsTagList) .CanCreateRelease}}
+		<a class="ui small primary button" href="{{$.RepoLink}}/releases/new{{if .PageIsSingleTag}}?tag={{.TagName}}{{end}}">
+			{{ctx.Locale.Tr "repo.release.new_release"}}
+		</a>
+	{{end}}
+</div>
+<div class="divider"></div>

templates/repo/tag/list.tmpl

@@ -3,7 +3,7 @@
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		{{template "repo/release_tag_header" .}}
+		{{template "repo/sub_menu" .}}
 		<h4 class="ui top attached header">
 			<div class="five wide column tw-flex tw-items-center">
 				{{.TagCount}} {{ctx.Locale.Tr "repo.release.tags"}}