Add the tag list page to the release page

models/release.go

@@ -54,7 +54,11 @@ func (r *Release) loadAttributes(e Engine) error {
 	if r.Publisher == nil {
 		r.Publisher, err = getUserByID(e, r.PublisherID)
 		if err != nil {
-			return err
+			if IsErrUserNotExist(err) {
+				r.Publisher = NewGhostUser()
+			} else {
+				return err
+			}
 		}
 	}
 	return getReleaseAttachments(e, r)

options/locale/locale_en-US.ini

@@ -784,6 +784,7 @@ org_labels_desc_manage = manage
 milestones = Milestones
 commits = Commits
 commit = Commit
+release = Release
 releases = Releases
 file_raw = Raw
 file_history = History
@@ -1745,6 +1746,8 @@ diff.committed_by = committed by
 
 releases.desc = Track project versions and downloads.
 release.releases = Releases
+release.detail = Release detail
+release.tags = Tags
 release.new_release = New Release
 release.draft = Draft
 release.prerelease = Pre-Release
@@ -1767,11 +1770,15 @@ release.publish = Publish Release
 release.save_draft = Save Draft
 release.edit_release = Update Release
 release.delete_release = Delete Release
+release.delete_tag = Delete Tag
 release.deletion = Delete Release
-release.deletion_desc = Deleting a release removes its Git tag from the repository. Repository contents and history remain unchanged. Continue?
+release.deletion_desc = Deleting a release only removes it from Gitea. Git tag, repository contents and history remain unchanged. Continue?
 release.deletion_success = The release has been deleted.
+release.deletion_tag_desc = Will delete this tag from repository. Repository contents and history remain unchanged. Continue?
+release.deletion_tag_success = The tag has been deleted.
 release.tag_name_already_exist = A release with this tag name already exists.
 release.tag_name_invalid = The tag name is not valid.
+release.tag_already_exist = This tag name already exists.
 release.downloads = Downloads
 release.download_count = Downloads: %s
 

routers/repo/release.go

@@ -54,9 +54,18 @@ func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *models.Rel
 
 // Releases render releases list page
 func Releases(ctx *context.Context) {
-	ctx.Data["Title"] = ctx.Tr("repo.release.releases")
 	ctx.Data["PageIsReleaseList"] = true
 
+	isTagList := ctx.Params(":type") == "tags"
+
+	if isTagList {
+		ctx.Data["Title"] = ctx.Tr("repo.release.tags")
+		ctx.Data["PageIsTagList"] = true
+	} else {
+		ctx.Data["Title"] = ctx.Tr("repo.release.releases")
+		ctx.Data["PageIsTagList"] = false
+	}
+
 	writeAccess := ctx.Repo.CanWrite(models.UnitTypeReleases)
 	ctx.Data["CanCreateRelease"] = writeAccess && !ctx.Repo.Repository.IsArchived
 
@@ -66,7 +75,7 @@ func Releases(ctx *context.Context) {
 			PageSize: convert.ToCorrectPageSize(ctx.QueryInt("limit")),
 		},
 		IncludeDrafts: writeAccess,
-		IncludeTags:   true,
+		IncludeTags:   isTagList,
 	}
 
 	releases, err := models.GetReleasesByRepoID(ctx.Repo.Repository.ID, opts)
@@ -81,8 +90,7 @@ func Releases(ctx *context.Context) {
 		return
 	}
 
-	err = models.GetReleaseAttachments(releases...)
-	if err != nil {
+	if err = models.GetReleaseAttachments(releases...); err != nil {
 		ctx.ServerError("GetReleaseAttachments", err)
 		return
 	}
@@ -193,6 +201,20 @@ func NewRelease(ctx *context.Context) {
 	ctx.Data["PageIsReleaseList"] = true
 	ctx.Data["tag_target"] = ctx.Repo.Repository.DefaultBranch
 	renderAttachmentSettings(ctx)
+	if tagName := ctx.Query("tag"); len(tagName) > 0 {
+		rel, err := models.GetRelease(ctx.Repo.Repository.ID, tagName)
+		if err != nil && !models.IsErrReleaseNotExist(err) {
+			ctx.ServerError("GetRelease", err)
+			return
+		}
+
+		if rel != nil {
+			ctx.Data["tag_name"] = rel.TagName
+			ctx.Data["tag_target"] = rel.Target
+			ctx.Data["title"] = rel.Title
+			ctx.Data["content"] = rel.Note
+		}
+	}
 	ctx.HTML(200, tplReleaseNew)
 }
 
@@ -350,10 +372,23 @@ func EditReleasePost(ctx *context.Context, form auth.EditReleaseForm) {
 
 // DeleteRelease delete a release
 func DeleteRelease(ctx *context.Context) {
-	if err := releaseservice.DeleteReleaseByID(ctx.QueryInt64("id"), ctx.User, true); err != nil {
+	isDelTag := ctx.Params(":type") == "tags"
+
+	if err := releaseservice.DeleteReleaseByID(ctx.QueryInt64("id"), ctx.User, isDelTag); err != nil {
 		ctx.Flash.Error("DeleteReleaseByID: " + err.Error())
 	} else {
-		ctx.Flash.Success(ctx.Tr("repo.release.deletion_success"))
+		if isDelTag {
+			ctx.Flash.Success(ctx.Tr("repo.release.deletion_tag_success"))
+		} else {
+			ctx.Flash.Success(ctx.Tr("repo.release.deletion_success"))
+		}
+	}
+
+	if isDelTag {
+		ctx.JSON(200, map[string]interface{}{
+			"redirect": ctx.Repo.RepoLink + "/tags",
+		})
+		return
 	}
 
 	ctx.JSON(200, map[string]interface{}{

routers/routes/routes.go

@@ -820,12 +820,12 @@ func RegisterRoutes(m *macaron.Macaron) {
 
 	// Releases
 	m.Group("/:username/:reponame", func() {
-		m.Group("/releases", func() {
+		m.Group("/^:type(releases|tags)$", func() {
 			m.Get("/", repo.Releases)
 			m.Get("/tag/:tag", repo.SingleRelease)
 			m.Get("/latest", repo.LatestRelease)
 		}, repo.MustBeNotEmpty, context.RepoRef())
-		m.Group("/releases", func() {
+		m.Group("/^:type(releases|tags)$", func() {
 			m.Get("/new", repo.NewRelease)
 			m.Post("/new", bindIgnErr(auth.NewReleaseForm{}), repo.NewReleasePost)
 			m.Post("/delete", repo.DeleteRelease)

services/release/release.go

@@ -147,10 +147,6 @@ func DeleteReleaseByID(id int64, doer *models.User, delTag bool) error {
 		}
 	} else {
 		rel.IsTag = true
-		rel.IsDraft = false
-		rel.IsPrerelease = false
-		rel.Title = ""
-		rel.Note = ""
 
 		if err = models.UpdateRelease(models.DefaultDBContext(), rel); err != nil {
 			return fmt.Errorf("Update: %v", err)

templates/repo/release/list.tmpl

@@ -3,16 +3,55 @@
 	{{template "repo/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		<h2 class="ui header">
-			{{.i18n.Tr "repo.release.releases"}}
-			{{if .CanCreateRelease}}
-				<div class="ui right">
-					<a class="ui small green button" href="{{$.RepoLink}}/releases/new">
-						{{.i18n.Tr "repo.release.new_release"}}
-					</a>
-				</div>
-			{{end}}
+		<h2 class="ui compact small menu header">
+			<a class="{{if (not .PageIsTagList)}}active{{end}} item" href="{{.RepoLink}}/releases">{{.i18n.Tr "repo.release.releases"}}</a>
+			<a class="{{if .PageIsTagList}}active{{end}} item" href="{{.RepoLink}}/tags">{{.i18n.Tr "repo.release.tags"}}</a>
 		</h2>
+		{{if (and .CanCreateRelease (not .PageIsTagList))}}
+			<a class="ui right small green button" href="{{$.RepoLink}}/releases/new">
+				{{.i18n.Tr "repo.release.new_release"}}
+			</a>
+		{{end}}
+		{{if .PageIsTagList}}
+		<div class="ui divider"></div>
+		<h4 class="ui top attached header">
+			<div class="five wide column">
+				{{.i18n.Tr "repo.release.tags"}}
+			</div>
+		</h4>
+		<div class="ui attached table segment">
+			<table class="ui very basic striped fixed table single line" id="tags-table">
+				<thead></thead>
+				<tbody class="tag-list">
+					{{range $idx, $release := .Releases}}
+						<tr>
+							<td class="tag">
+								<h4>
+									<a href="{{$.RepoLink}}/src/tag/{{.TagName | EscapePound}}" rel="nofollow"><i class="tag icon"></i> {{.TagName}}</a>
+								</h4>
+								<div class="download">
+									{{if $.Permission.CanRead $.UnitTypeCode}}
+										<a href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow"><i class="code icon"></i> {{ShortSha .Sha1}}</a>
+										<a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16}}&nbsp;ZIP</a>
+										<a href="{{$.RepoLink}}/archive/{{.TagName | EscapePound}}.tar.gz">{{svg "octicon-file-zip" 16}}&nbsp;TAR.GZ</a>
+										{{if (and $.CanCreateRelease $release.IsTag)}}
+											<a href="{{$.RepoLink}}/releases/new?tag={{.TagName | EscapePound}}">{{svg "octicon-tag" 16}}&nbsp;{{$.i18n.Tr "repo.release.new_release"}}</a>
+											<a class="ui red delete-button" data-url="{{$.RepoLink}}/tags/delete" data-id="{{.ID}}">
+												<i class="trash icon"></i>&nbsp;{{$.i18n.Tr "repo.release.delete_tag"}}
+											</a>
+										{{end}}
+										{{if (not $release.IsTag)}}
+											<a href="{{$.RepoLink}}/releases/tag/{{.TagName | EscapePound}}">{{svg "octicon-tag" 16}}&nbsp;{{$.i18n.Tr "repo.release.detail"}}</a>
+										{{end}}
+									{{end}}
+								</div>
+							</td>
+						</tr>
+					{{end}}
+				</tbody>
+			</table>
+		</div>
+		{{else}}
 		<ul id="release-list">
 			{{range $idx, $release := .Releases}}
 				<li class="ui grid">
@@ -107,7 +146,22 @@
 				</li>
 			{{end}}
 		</ul>
+		{{end}}
 		{{template "base/paginate" .}}
 	</div>
 </div>
+
+{{if (and .CanCreateRelease .PageIsTagList)}}
+	<div class="ui small basic delete modal">
+		<div class="ui icon header">
+			<i class="trash icon"></i>
+			{{.i18n.Tr "repo.release.delete_tag"}}
+		</div>
+		<div class="content">
+			<p>{{.i18n.Tr "repo.release.deletion_tag_desc"}}</p>
+		</div>
+		{{template "base/delete_modal_actions" .}}
+	</div>
+{{end}}
+
 {{template "base/footer" .}}

templates/repo/sub_menu.tmpl

@@ -5,11 +5,12 @@
 				<div class="item{{if .PageIsCommits}} active{{end}}">
 					<a class="ui" href="{{.RepoLink}}/commits{{if .IsViewBranch}}/branch{{else if .IsViewTag}}/tag{{else if .IsViewCommit}}/commit{{end}}/{{EscapePound .BranchName}}">{{svg "octicon-history"}} <b>{{.CommitsCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .CommitsCount "repo.commit" "repo.commits") }}</a>
 				</div>
-			{{end}}
-			{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) }}
 				<div class="item{{if .PageIsBranches}} active{{end}}">
 					<a class="ui" href="{{.RepoLink}}/branches/">{{svg "octicon-git-branch"}} <b>{{.BranchesCount}}</b> {{.i18n.Tr (TrN .i18n.Lang .BranchesCount "repo.branch" "repo.branches") }}</a>
 				</div>
+				<div class="item">
+					<a class="ui" href="{{.RepoLink}}/tags">{{svg "octicon-tag"}} <b>{{.NumReleases}}</b> {{.i18n.Tr (TrN .i18n.Lang .NumReleases "repo.release" "repo.releases") }}</a>
+				</div>
 				<div class="item">
 					<span class="ui">{{svg "octicon-database"}} <b>{{SizeFmt .Repository.Size}}</b></span>
 				</div>