aboutsummaryrefslogtreecommitdiffstats
path: root/routers/repo/release.go
diff options
context:
space:
mode:
authora1012112796 <1012112796@qq.com>2021-05-06 11:12:50 +0800
committerGitHub <noreply@github.com>2021-05-06 05:12:50 +0200
commit308886653148d859080222ebb72966e020f9391e (patch)
treef61bd23f73eee6a30cf28c477bf0d1c859b8aace /routers/repo/release.go
parenteedc0c8324820817f4c06603ec3195a1d3513542 (diff)
downloadgitea-308886653148d859080222ebb72966e020f9391e.tar.gz
gitea-308886653148d859080222ebb72966e020f9391e.zip
fix some ui bug about draft release (#15137)
* fix some ui bug about draft release - should not show draft release in tag list because it will't create real tag - still show draft release without tag and commit message for draft release instead of 404 error - remove tag load for attachement links because it's useless Signed-off-by: a1012112796 <1012112796@qq.com> * add test code * fix test That's because has added a new release in relaese test database. * fix dropdown link for draft release
Diffstat (limited to 'routers/repo/release.go')
-rw-r--r--routers/repo/release.go24
1 files changed, 16 insertions, 8 deletions
diff --git a/routers/repo/release.go b/routers/repo/release.go
index 6b0b92743d..b7730e4ee2 100644
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -99,7 +99,7 @@ func releasesOrTags(ctx *context.Context, isTagList bool) {
Page: ctx.QueryInt("page"),
PageSize: convert.ToCorrectPageSize(ctx.QueryInt("limit")),
},
- IncludeDrafts: writeAccess,
+ IncludeDrafts: writeAccess && !isTagList,
IncludeTags: isTagList,
}
@@ -141,10 +141,7 @@ func releasesOrTags(ctx *context.Context, isTagList bool) {
}
cacheUsers[r.PublisherID] = r.Publisher
}
- if err := calReleaseNumCommitsBehind(ctx.Repo, r, countCache); err != nil {
- ctx.ServerError("calReleaseNumCommitsBehind", err)
- return
- }
+
r.Note, err = markdown.RenderString(&markup.RenderContext{
URLPrefix: ctx.Repo.RepoLink,
Metas: ctx.Repo.Repository.ComposeMetas(),
@@ -153,6 +150,15 @@ func releasesOrTags(ctx *context.Context, isTagList bool) {
ctx.ServerError("RenderString", err)
return
}
+
+ if r.IsDraft {
+ continue
+ }
+
+ if err := calReleaseNumCommitsBehind(ctx.Repo, r, countCache); err != nil {
+ ctx.ServerError("calReleaseNumCommitsBehind", err)
+ return
+ }
}
ctx.Data["Releases"] = releases
@@ -198,9 +204,11 @@ func SingleRelease(ctx *context.Context) {
return
}
}
- if err := calReleaseNumCommitsBehind(ctx.Repo, release, make(map[string]int64)); err != nil {
- ctx.ServerError("calReleaseNumCommitsBehind", err)
- return
+ if !release.IsDraft {
+ if err := calReleaseNumCommitsBehind(ctx.Repo, release, make(map[string]int64)); err != nil {
+ ctx.ServerError("calReleaseNumCommitsBehind", err)
+ return
+ }
}
release.Note, err = markdown.RenderString(&markup.RenderContext{
URLPrefix: ctx.Repo.RepoLink,