Add tags list for repos whose release setting is disabled

routers/web/repo/release.go

@@ -29,8 +29,9 @@ import (
 )
 
 const (
- tplReleases base.TplName = "repo/release/list"
- tplReleaseNew base.TplName = "repo/release/new"
+ tplReleasesList base.TplName = "repo/release/list"
+ tplReleaseNew base.TplName = "repo/release/new"
+ tplTagsList base.TplName = "repo/tag/list"
 )
 
 // calReleaseNumCommitsBehind calculates given release has how many commits behind release target.
@@ -58,31 +59,26 @@ func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *repo_model
 
 // Releases render releases list page
 func Releases(ctx *context.Context) {
+ ctx.Data["PageIsReleaseList"] = true
+ ctx.Data["Title"] = ctx.Tr("repo.release.releases")
  releasesOrTags(ctx, false)
 }
 
 // TagsList render tags list page
 func TagsList(ctx *context.Context) {
+ ctx.Data["PageIsTagList"] = true
+ ctx.Data["Title"] = ctx.Tr("repo.release.tags")
  releasesOrTags(ctx, true)
 }
 
 func releasesOrTags(ctx *context.Context, isTagList bool) {
- ctx.Data["PageIsReleaseList"] = true
  ctx.Data["DefaultBranch"] = ctx.Repo.Repository.DefaultBranch
  ctx.Data["IsViewBranch"] = false
  ctx.Data["IsViewTag"] = true
  // Disable the showCreateNewBranch form in the dropdown on this page.
  ctx.Data["CanCreateBranch"] = false
  ctx.Data["HideBranchesInDropdown"] = true
 
- 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
- }
-
  listOptions := db.ListOptions{
  Page: ctx.FormInt("page"),
  PageSize: ctx.FormInt("limit"),
@@ -196,7 +192,11 @@ func releasesOrTags(ctx *context.Context, isTagList bool) {
  pager.SetDefaultParams(ctx)
  ctx.Data["Page"] = pager
 
- ctx.HTML(http.StatusOK, tplReleases)
+ if isTagList {
+ ctx.HTML(http.StatusOK, tplTagsList)
+ } else {
+ ctx.HTML(http.StatusOK, tplReleasesList)
+ }
 }
 
 // ReleasesFeedRSS get feeds for releases in RSS format
@@ -282,7 +282,7 @@ func SingleRelease(ctx *context.Context) {
  }
 
  ctx.Data["Releases"] = []*repo_model.Release{release}
- ctx.HTML(http.StatusOK, tplReleases)
+ ctx.HTML(http.StatusOK, tplReleasesList)
 }
 
 // LatestRelease redirects to the latest release

routers/web/web.go

@@ -1198,7 +1198,7 @@ func RegisterRoutes(m *web.Route) {
  }, context.RepoMustNotBeArchived(), reqRepoCodeWriter, repo.MustBeNotEmpty)
  }, reqSignIn, context.RepoAssignment, context.UnitTypes())
 
- // Releases
+ // Tags
  m.Group("/{username}/{reponame}", func() {
  m.Group("/tags", func() {
  m.Get("", repo.TagsList)
@@ -1207,6 +1207,12 @@ func RegisterRoutes(m *web.Route) {
  }, func(ctx *context.Context) {
  ctx.Data["EnableFeed"] = setting.Other.EnableFeed
  }, repo.MustBeNotEmpty, reqRepoCodeReader, context.RepoRefByType(context.RepoRefTag, true))
+ m.Post("/tags/delete", repo.DeleteTag, reqSignIn,
+ repo.MustBeNotEmpty, context.RepoMustNotBeArchived(), reqRepoCodeWriter, context.RepoRef())
+ }, reqSignIn, context.RepoAssignment, context.UnitTypes())
+
+ // Releases
+ m.Group("/{username}/{reponame}", func() {
  m.Group("/releases", func() {
  m.Get("/", repo.Releases)
  m.Get("/tag/*", repo.SingleRelease)
@@ -1224,8 +1230,6 @@ func RegisterRoutes(m *web.Route) {
  m.Post("/attachments", repo.UploadReleaseAttachment)
  m.Post("/attachments/remove", repo.DeleteAttachment)
  }, reqSignIn, repo.MustBeNotEmpty, context.RepoMustNotBeArchived(), reqRepoReleaseWriter, context.RepoRef())
- m.Post("/tags/delete", repo.DeleteTag, reqSignIn,
- repo.MustBeNotEmpty, context.RepoMustNotBeArchived(), reqRepoCodeWriter, context.RepoRef())
  m.Group("/releases", func() {
  m.Get("/edit/*", repo.EditRelease)
  m.Post("/edit/*", web.Bind(forms.EditReleaseForm{}), repo.EditReleasePost)

templates/repo/release/list.tmpl

@@ -1,73 +1,16 @@
 {{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content repository release">
+<div role="main" aria-label="{{.Title}}" class="page-content repository releases">
  {{template "repo/header" .}}
  <div class="ui container">
  {{template "base/alert" .}}
- <h2 class="ui compact small menu header">
- {{if .Permission.CanRead $.UnitTypeReleases}}
- <a class="{{if (and (not .PageIsSingleTag) (not .PageIsTagList))}}active {{end}}item" href="{{.RepoLink}}/releases">{{.locale.Tr "repo.release.releases"}}</a>
- {{end}}
- {{if .Permission.CanRead $.UnitTypeCode}}
- <a class="{{if (or .PageIsSingleTag .PageIsTagList)}}active {{end}}item" href="{{.RepoLink}}/tags">{{.locale.Tr "repo.release.tags"}}</a>
- {{end}}
- </h2>
- {{if .EnableFeed}}
- <a href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss"><i class="ui grey icon gt-ml-3" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a>
- {{end}}
- {{if (and .CanCreateRelease (not .PageIsTagList))}}
+ {{template "repo/sub_menu_release_tag" .}}
+
+ {{if .CanCreateRelease}}
  <a class="ui right small green button" href="{{$.RepoLink}}/releases/new">
  {{.locale.Tr "repo.release.new_release"}}
  </a>
  {{end}}
- {{if .PageIsTagList}}
- <div class="ui divider"></div>
- {{if gt .ReleasesNum 0}}
- <h4 class="ui top attached header">
- <div class="five wide column gt-df gt-ac">
- {{svg "octicon-tag" 16 "gt-mr-2"}}{{.locale.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">
- <h3 class="release-tag-name gt-mb-3">
- <a class="gt-df gt-ac" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a>
- </h3>
- <div class="download gt-df gt-ac">
- {{if $.Permission.CanRead $.UnitTypeCode}}
- {{if .CreatedUnix}}
- <span class="gt-mr-3">{{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix $.locale}}</span>
- {{end}}
- <a class="gt-mr-3 gt-mono muted" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
- {{if not $.DisableDownloadSourceArchives}}
- <a class="archive-link gt-mr-3 muted" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "gt-mr-2"}}ZIP</a>
- <a class="archive-link gt-mr-3 muted" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "gt-mr-2"}}TAR.GZ</a>
- {{end}}
- {{if (and $.CanCreateRelease $release.IsTag)}}
- <a class="gt-mr-3 muted" href="{{$.RepoLink}}/releases/new?tag={{.TagName}}">{{svg "octicon-tag" 16 "gt-mr-2"}}{{$.locale.Tr "repo.release.new_release"}}</a>
- {{end}}
- {{if (and ($.Permission.CanWrite $.UnitTypeCode) $release.IsTag)}}
- <a class="ui delete-button gt-mr-3 muted" data-url="{{$.RepoLink}}/tags/delete" data-id="{{.ID}}">
- {{svg "octicon-trash" 16 "gt-mr-2"}}{{$.locale.Tr "repo.release.delete_tag"}}
- </a>
- {{end}}
- {{if (not $release.IsTag)}}
- <a class="gt-mr-3 muted" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}">{{svg "octicon-tag" 16 "gt-mr-2"}}{{$.locale.Tr "repo.release.detail"}}</a>
- {{end}}
- {{end}}
- </div>
- </td>
- </tr>
- {{end}}
- </tbody>
- </table>
- </div>
- {{end}}
- {{else}}
+
  <ul id="release-list">
  {{range $idx, $release := .Releases}}
  <li class="ui grid">
@@ -178,22 +121,9 @@
  </li>
  {{end}}
  </ul>
- {{end}}
+
  {{template "base/paginate" .}}
  </div>
 </div>
 
-{{if (and ($.Permission.CanWrite $.UnitTypeCode) .PageIsTagList)}}
- <div class="ui gitea-confirm-modal delete modal">
- <div class="header">
- {{svg "octicon-trash"}}
- {{.locale.Tr "repo.release.delete_tag"}}
- </div>
- <div class="content">
- <p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p>
- </div>
- {{template "base/modal_actions_confirm" .}}
- </div>
-{{end}}
-
 {{template "base/footer" .}}

templates/repo/sub_menu.tmpl

@@ -10,7 +10,7 @@
  <a href="{{.RepoLink}}/branches">{{svg "octicon-git-branch"}} <b>{{.BranchesCount}}</b> {{.locale.TrN .BranchesCount "repo.branch" "repo.branches"}}</a>
  </div>
  {{if $.Permission.CanRead $.UnitTypeCode}}
- <div class="item">
+ <div class="item{{if .PageIsTagList}} active{{end}}">
  <a href="{{.RepoLink}}/tags">{{svg "octicon-tag"}} <b>{{.NumTags}}</b> {{.locale.TrN .NumTags "repo.tag" "repo.tags"}}</a>
  </div>
  {{end}}

templates/repo/sub_menu_release_tag.tmpl

@@ -0,0 +1,17 @@
+{{$canReadReleases := $.Permission.CanRead $.UnitTypeReleases}}
+{{$canReadCode := $.Permission.CanRead $.UnitTypeCode}}
+
+{{if $canReadReleases}}
+ <h2 class="ui compact small menu header">
+ <a class="{{if .PageIsReleaseList}}active {{end}}item" href="{{.RepoLink}}/releases">{{.locale.Tr "repo.release.releases"}}</a>
+ {{if $canReadCode}}
+ <a class="{{if .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/tags">{{.locale.Tr "repo.release.tags"}}</a>
+ {{end}}
+ </h2>
+
+ {{if .EnableFeed}}
+ <a href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss"><i class="ui grey icon gt-ml-3" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a>
+ {{end}}
+{{else if $canReadCode}}
+ {{template "repo/sub_menu" .}}
+{{end}}

templates/repo/tag/list.tmpl

@@ -0,0 +1,85 @@
+{{template "base/head" .}}
+
+<div role="main" aria-label="{{.Title}}" class="page-content repository tags">
+ {{template "repo/header" .}}
+ <div class="ui container">
+ {{template "base/alert" .}}
+ {{template "repo/sub_menu_release_tag" .}}
+
+ <div class="ui divider"></div>
+
+ <h4 class="ui top attached header">
+ <div class="five wide column gt-df gt-ac">
+ {{svg "octicon-tag" 16 "gt-mr-2"}}{{.locale.Tr "repo.release.tags"}}
+ </div>
+ </h4>
+
+ {{$canReadReleases := $.Permission.CanRead $.UnitTypeReleases}}
+
+ <div class="ui attached table segment">
+ <table class="ui very basic striped fixed table single line" id="tags-table">
+ <tbody class="tag-list">
+ {{range $idx, $release := .Releases}}
+ <tr>
+ <td class="tag">
+ <h3 class="release-tag-name gt-mb-3">
+ {{if $canReadReleases}}
+ <a class="gt-df gt-ac" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a>
+ {{else}}
+ <a class="gt-df gt-ac" href="{{$.RepoLink}}/src/tag/{{.TagName | PathEscapeSegments}}" rel="nofollow">{{.TagName}}</a>
+ {{end}}
+ </h3>
+ <div class="download gt-df gt-ac">
+ {{if $.Permission.CanRead $.UnitTypeCode}}
+ {{if .CreatedUnix}}
+ <span class="gt-mr-3">{{svg "octicon-clock" 16 "gt-mr-2"}}{{TimeSinceUnix .CreatedUnix $.locale}}</span>
+ {{end}}
+
+ <a class="gt-mr-3 gt-mono muted" href="{{$.RepoLink}}/src/commit/{{.Sha1}}" rel="nofollow">{{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}}</a>
+
+ {{if not $.DisableDownloadSourceArchives}}
+ <a class="archive-link gt-mr-3 muted" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.zip" rel="nofollow">{{svg "octicon-file-zip" 16 "gt-mr-2"}}ZIP</a>
+ <a class="archive-link gt-mr-3 muted" href="{{$.RepoLink}}/archive/{{.TagName | PathEscapeSegments}}.tar.gz" rel="nofollow">{{svg "octicon-file-zip" 16 "gt-mr-2"}}TAR.GZ</a>
+ {{end}}
+
+ {{if (and $canReadReleases $.CanCreateRelease $release.IsTag)}}
+ <a class="gt-mr-3 muted" href="{{$.RepoLink}}/releases/new?tag={{.TagName}}">{{svg "octicon-tag" 16 "gt-mr-2"}}{{$.locale.Tr "repo.release.new_release"}}</a>
+ {{end}}
+
+ {{if (and ($.Permission.CanWrite $.UnitTypeCode) $release.IsTag)}}
+ <a class="ui delete-button gt-mr-3 muted" data-url="{{$.RepoLink}}/tags/delete" data-id="{{.ID}}">
+ {{svg "octicon-trash" 16 "gt-mr-2"}}{{$.locale.Tr "repo.release.delete_tag"}}
+ </a>
+ {{end}}
+
+ {{if and $canReadReleases (not $release.IsTag)}}
+ <a class="gt-mr-3 muted" href="{{$.RepoLink}}/releases/tag/{{.TagName | PathEscapeSegments}}">{{svg "octicon-tag" 16 "gt-mr-2"}}{{$.locale.Tr "repo.release.detail"}}</a>
+ {{end}}
+ {{end}}
+ </div>
+ </td>
+ </tr>
+ {{end}}
+ </tbody>
+ </table>
+ </div>
+
+ {{template "base/paginate" .}}
+ </div>
+</div>
+
+{{if $.Permission.CanWrite $.UnitTypeCode}}
+<div class="ui gitea-confirm-modal delete modal">
+ <div class="header">
+ {{svg "octicon-trash"}}
+ {{.locale.Tr "repo.release.delete_tag"}}
+ </div>
+ <div class="content">
+ <p>{{.locale.Tr "repo.release.deletion_tag_desc"}}</p>
+ </div>
+ {{template "base/modal_actions_confirm" .}}
+</div>
+{{end}}
+
+
+{{template "base/footer" .}}

web_src/css/index.css

@@ -30,6 +30,7 @@
 @import "./install.css";
 @import "./form.css";
 @import "./repository.css";
+@import "./repository-release-tag.css";
 @import "./editor.css";
 @import "./editor-markdown.css";
 @import "./organization.css";