From 35bc1ea9418bb69a1cf7d81087ad288bb71fb2b1 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Thu, 2 Mar 2023 12:23:48 +0100 Subject: [PATCH 1/4] Fix setting DefaultBranch variable that is used in template Signed-off-by: Wiktor Kwapisiewicz --- routers/web/repo/release.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index e969fdc5ab377..bd5d5a388ed68 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -228,6 +228,7 @@ func releasesOrTagsFeed(ctx *context.Context, isReleasesOnly bool, formatType st func SingleRelease(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.release.releases") ctx.Data["PageIsReleaseList"] = true + ctx.Data["DefaultBranch"] = ctx.Repo.Repository.DefaultBranch writeAccess := ctx.Repo.CanWrite(unit.TypeReleases) ctx.Data["CanCreateRelease"] = writeAccess && !ctx.Repo.Repository.IsArchived From 52fbd92aa8fc4643ca59caab7c3b6abfaa0442fe Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Thu, 2 Mar 2023 12:25:00 +0100 Subject: [PATCH 2/4] Set default properties for releases created from tags This makes it easier to create new releases from tags as the release form is pre-filled with data that is in the tag message anyway. Signed-off-by: Wiktor Kwapisiewicz --- services/repository/push.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/services/repository/push.go b/services/repository/push.go index 4b574e3440679..7f174c71b3f86 100644 --- a/services/repository/push.go +++ b/services/repository/push.go @@ -374,15 +374,20 @@ func pushUpdateAddTags(ctx context.Context, repo *repo_model.Repository, gitRepo rel, has := relMap[lowerTag] if !has { + parts := strings.SplitN(tag.Message, "\n", 2) + note := "" + if len(parts) > 1 { + note = parts[1] + } rel = &repo_model.Release{ RepoID: repo.ID, - Title: "", + Title: parts[0], TagName: tags[i], LowerTagName: lowerTag, Target: "", Sha1: commit.ID.String(), NumCommits: commitsCount, - Note: "", + Note: note, IsDraft: false, IsPrerelease: false, IsTag: true, From e7c96f71304bf16dfb35516f5157f6bacceeec0d Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Thu, 2 Mar 2023 12:26:28 +0100 Subject: [PATCH 3/4] Unify tag display view with that of release This patch makes Tag view look more similar to the one of Release by making more template fragments reuse the same markup. Fixes: https://github.com/go-gitea/gitea/issues/23221 --- templates/repo/release/list.tmpl | 54 +++++++++++--------------------- 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 8b320a956c183..7ed1847294123 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -35,7 +35,7 @@

- {{.TagName}} + {{.TagName}}

{{if $.Permission.CanRead $.UnitTypeCode}} @@ -69,9 +69,6 @@ {{range $idx, $release := .Releases}}
  • - {{if .IsTag}} - {{if .CreatedUnix}}{{TimeSinceUnix .CreatedUnix $.locale}}{{end}} - {{else}} {{svg "octicon-tag" 16 "gt-mr-2"}}{{.TagName}} {{if .Sha1}} @@ -79,15 +76,28 @@ {{template "repo/branch_dropdown" dict "root" $ "release" .}} {{end}} - {{end}}
    - {{if .IsTag}}

    - {{svg "octicon-tag" 24 "gt-mr-3"}}{{.TagName}} + {{.Title}} + {{if .IsDraft}} + {{$.locale.Tr "repo.release.draft"}} + {{else if .IsPrerelease}} + {{$.locale.Tr "repo.release.prerelease"}} + {{else if not .IsTag}} + {{$.locale.Tr "repo.release.stable"}} + {{end}}

    +
    + {{if $.CanCreateRelease}} + + {{svg "octicon-pencil"}} + + {{end}} +
    + {{if .IsTag}}

    {{if gt .Publisher.ID 0}} @@ -104,35 +114,7 @@ {{end}} {{$.locale.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}} {{$.locale.Tr "repo.release.ahead.target" $.DefaultBranch}}

    -
    - {{if $.Permission.CanRead $.UnitTypeCode}} - {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}} - {{if not $.DisableDownloadSourceArchives}} - {{svg "octicon-file-zip"}} ZIP - {{svg "octicon-file-zip"}} TAR.GZ - {{end}} - {{end}} -
    {{else}} -
    -

    - {{.Title}} - {{if .IsDraft}} - {{$.locale.Tr "repo.release.draft"}} - {{else if .IsPrerelease}} - {{$.locale.Tr "repo.release.prerelease"}} - {{else if not .IsTag}} - {{$.locale.Tr "repo.release.stable"}} - {{end}} -

    -
    - {{if $.CanCreateRelease}} - - {{svg "octicon-pencil"}} - - {{end}} -
    -

    {{if .OriginalAuthor}} @@ -154,6 +136,7 @@ | {{$.locale.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}} {{$.locale.Tr "repo.release.ahead.target" .Target}} {{end}}

    + {{end}}
    {{Str2html .Note}}
    @@ -187,7 +170,6 @@ {{end}} - {{end}}  
    • From c6c6fadb9e1b19eb0ee4e63a31850198680bd2c9 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Fri, 3 Mar 2023 09:19:34 +0100 Subject: [PATCH 4/4] Add localization to tagged by / since this tag --- options/locale/locale_en-US.ini | 2 ++ routers/web/repo/release.go | 7 ++++++- templates/repo/release/list.tmpl | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 12dcd6e0172f3..d09ea26942b4d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1068,6 +1068,7 @@ release = Release releases = Releases tag = Tag released_this = released this +tagged_this = tagged this file.title = %s at %s file_raw = Raw file_history = History @@ -2287,6 +2288,7 @@ release.compare = Compare release.edit = edit release.ahead.commits = %d commits release.ahead.target = to %s since this release +tag.ahead.target = to %s since this tag release.source_code = Source Code release.new_subheader = Releases organize project versions. release.edit_subheader = Releases organize project versions. diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index bd5d5a388ed68..3ffadd34ace7b 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -226,7 +226,6 @@ func releasesOrTagsFeed(ctx *context.Context, isReleasesOnly bool, formatType st // SingleRelease renders a single release's page func SingleRelease(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.release.releases") ctx.Data["PageIsReleaseList"] = true ctx.Data["DefaultBranch"] = ctx.Repo.Repository.DefaultBranch @@ -242,6 +241,12 @@ func SingleRelease(ctx *context.Context) { ctx.ServerError("GetReleasesByRepoID", err) return } + ctx.Data["PageIsSingleTag"] = release.IsTag + if release.IsTag { + ctx.Data["Title"] = release.TagName + } else { + ctx.Data["Title"] = release.Title + } err = repo_model.GetReleaseAttachments(ctx, release) if err != nil { diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 7ed1847294123..5e5716fa573c5 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -5,10 +5,10 @@ {{template "base/alert" .}}

    {{if .Permission.CanRead $.UnitTypeReleases}} - {{.locale.Tr "repo.release.releases"}} + {{.locale.Tr "repo.release.releases"}} {{end}} {{if .Permission.CanRead $.UnitTypeCode}} - {{.locale.Tr "repo.release.tags"}} + {{.locale.Tr "repo.release.tags"}} {{end}}

    {{if .EnableFeed}} @@ -105,14 +105,14 @@ {{.Publisher.Name}} - {{$.locale.Tr "repo.released_this"}} + {{$.locale.Tr "repo.tagged_this"}} {{if .CreatedUnix}} {{TimeSinceUnix .CreatedUnix $.locale}} {{end}} | {{end}} - {{$.locale.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}} {{$.locale.Tr "repo.release.ahead.target" $.DefaultBranch}} + {{$.locale.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}} {{$.locale.Tr "repo.tag.ahead.target" $.DefaultBranch}}

    {{else}}