diff options
author | wxiaoguang <wxiaoguang@gmail.com> | 2025-01-15 11:15:47 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-01-15 11:15:47 +0800 |
commit | fcd096231ac2deaefbca10a7db1b9b01f1da93d7 (patch) | |
tree | a6b0b3545fcd7c3830dc614f2c0ca3dab4751748 /routers/web/repo | |
parent | cbf933eb4e344cc182d70553a14fe778f42422d0 (diff) | |
download | gitea-fcd096231ac2deaefbca10a7db1b9b01f1da93d7.tar.gz gitea-fcd096231ac2deaefbca10a7db1b9b01f1da93d7.zip |
Simplify context ref name (#33267)
Diffstat (limited to 'routers/web/repo')
-rw-r--r-- | routers/web/repo/branch.go | 4 | ||||
-rw-r--r-- | routers/web/repo/commit.go | 6 | ||||
-rw-r--r-- | routers/web/repo/release.go | 4 | ||||
-rw-r--r-- | routers/web/repo/view_file.go | 4 | ||||
-rw-r--r-- | routers/web/repo/view_home.go | 2 |
5 files changed, 5 insertions, 15 deletions
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go index 51d91b7d6a..5011cbfc77 100644 --- a/routers/web/repo/branch.go +++ b/routers/web/repo/branch.go @@ -193,11 +193,11 @@ func CreateBranch(ctx *context.Context) { if form.CreateTag { target := ctx.Repo.CommitID - if ctx.Repo.IsViewBranch { + if ctx.Repo.RefFullName.IsBranch() { target = ctx.Repo.BranchName } err = release_service.CreateNewTag(ctx, ctx.Doer, ctx.Repo.Repository, target, form.NewBranchName, "") - } else if ctx.Repo.IsViewBranch { + } else if ctx.Repo.RefFullName.IsBranch() { err = repo_service.CreateNewBranch(ctx, ctx.Doer, ctx.Repo.Repository, ctx.Repo.GitRepo, ctx.Repo.BranchName, form.NewBranchName) } else { err = repo_service.CreateNewBranchFromCommit(ctx, ctx.Doer, ctx.Repo.Repository, ctx.Repo.GitRepo, ctx.Repo.CommitID, form.NewBranchName) diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go index b5498ccd2c..bad8ca56d1 100644 --- a/routers/web/repo/commit.go +++ b/routers/web/repo/commit.go @@ -390,12 +390,6 @@ func Diff(ctx *context.Context) { } } - ctx.Data["BranchName"], err = commit.GetBranchName() - if err != nil { - ctx.ServerError("commit.GetBranchName", err) - return - } - ctx.HTML(http.StatusOK, tplCommitPage) } diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go index 8909dedbb1..19b83915af 100644 --- a/routers/web/repo/release.go +++ b/routers/web/repo/release.go @@ -148,8 +148,6 @@ func getReleaseInfos(ctx *context.Context, opts *repo_model.FindReleasesOptions) func Releases(ctx *context.Context) { ctx.Data["PageIsReleaseList"] = true ctx.Data["Title"] = ctx.Tr("repo.release.releases") - ctx.Data["IsViewBranch"] = false - ctx.Data["IsViewTag"] = true listOptions := db.ListOptions{ Page: ctx.FormInt("page"), @@ -194,8 +192,6 @@ func Releases(ctx *context.Context) { func TagsList(ctx *context.Context) { ctx.Data["PageIsTagList"] = true ctx.Data["Title"] = ctx.Tr("repo.release.tags") - ctx.Data["IsViewBranch"] = false - ctx.Data["IsViewTag"] = true ctx.Data["CanCreateRelease"] = ctx.Repo.CanWrite(unit.TypeReleases) && !ctx.Repo.Repository.IsArchived namePattern := ctx.FormTrim("q") diff --git a/routers/web/repo/view_file.go b/routers/web/repo/view_file.go index 0b4381edfb..5784297918 100644 --- a/routers/web/repo/view_file.go +++ b/routers/web/repo/view_file.go @@ -232,7 +232,7 @@ func prepareToRenderFile(ctx *context.Context, entry *git.TreeEntry) { ctx.Data["CanEditFile"] = true ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.edit_this_file") } - } else if !ctx.Repo.IsViewBranch { + } else if !ctx.Repo.RefFullName.IsBranch() { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") } else if !ctx.Repo.CanWriteToBranch(ctx, ctx.Doer, ctx.Repo.BranchName) { ctx.Data["EditFileTooltip"] = ctx.Tr("repo.editor.fork_before_edit") @@ -305,7 +305,7 @@ func prepareToRenderFile(ctx *context.Context, entry *git.TreeEntry) { ctx.Data["CanDeleteFile"] = true ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.delete_this_file") } - } else if !ctx.Repo.IsViewBranch { + } else if !ctx.Repo.RefFullName.IsBranch() { ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_be_on_a_branch") } else if !ctx.Repo.CanWriteToBranch(ctx, ctx.Doer, ctx.Repo.BranchName) { ctx.Data["DeleteFileTooltip"] = ctx.Tr("repo.editor.must_have_write_access") diff --git a/routers/web/repo/view_home.go b/routers/web/repo/view_home.go index 54a58cd8be..ff2ee3c7ec 100644 --- a/routers/web/repo/view_home.go +++ b/routers/web/repo/view_home.go @@ -178,7 +178,7 @@ func prepareHomeSidebarLatestRelease(ctx *context.Context) { } func prepareUpstreamDivergingInfo(ctx *context.Context) { - if !ctx.Repo.Repository.IsFork || !ctx.Repo.IsViewBranch || ctx.Repo.TreePath != "" { + if !ctx.Repo.Repository.IsFork || !ctx.Repo.RefFullName.IsBranch() || ctx.Repo.TreePath != "" { return } upstreamDivergingInfo, err := repo_service.GetUpstreamDivergingInfo(ctx, ctx.Repo.Repository, ctx.Repo.BranchName) |