Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect whether action view branch was deleted #32764

Merged
merged 15 commits into from
Dec 12, 2024
+69 −9
Merged

Detect whether action view branch was deleted #32764

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d37bd75
Detect whether action view branch was deleted
lunny Dec 8, 2024
2b6a605
Don't remove the link but add isDeleted
lunny Dec 10, 2024
a87efd7
Merge branch 'main' into lunny/detect_action_branch_deleted
lunny Dec 10, 2024
890863f
Add deleted mark for branches in action list
lunny Dec 10, 2024
450b309
Merge branch 'main' into lunny/detect_action_branch_deleted
lunny Dec 10, 2024
affe773
Make the code simpler
lunny Dec 10, 2024
3a06760
Don't return 500 even if load isdelete failed
lunny Dec 10, 2024
f45c6f6
Merge branch 'main' into lunny/detect_action_branch_deleted
lunny Dec 10, 2024
a16748d
Merge branch 'main' into lunny/detect_action_branch_deleted
lunny Dec 10, 2024
de6160a
Follow feedbacks
lunny Dec 11, 2024
434e3ed
Merge branch 'main' into lunny/detect_action_branch_deleted
lunny Dec 11, 2024
581c194
Merge branch 'lunny/detect_action_branch_deleted' of github.com:lunny…
lunny Dec 11, 2024
632b154
Merge branch 'main' into lunny/detect_action_branch_deleted
GiteaBot Dec 12, 2024
e1eab27
Merge branch 'main' into lunny/detect_action_branch_deleted
GiteaBot Dec 12, 2024
f1fa72d
Merge branch 'main' into lunny/detect_action_branch_deleted
GiteaBot Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions routers/web/repo/actions/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (

actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/models/db"
git_model "code.gitea.io/gitea/models/git"
"code.gitea.io/gitea/models/perm"
access_model "code.gitea.io/gitea/models/perm/access"
repo_model "code.gitea.io/gitea/models/repo"
Expand Down Expand Up @@ -236,6 +237,16 @@ func ViewPost(ctx *context_module.Context) {
Name: run.PrettyRef(),
Link: run.RefLink(),
}
refName := git.RefName(run.Ref)
if refName.IsBranch() {
b, err := git_model.GetBranch(ctx, ctx.Repo.Repository.ID, refName.ShortName())
if err != nil && !git_model.IsErrBranchNotExist(err) {
log.Error("GetBranch: %v", err)
} else if git_model.IsErrBranchNotExist(err) || (b != nil && b.IsDeleted) {
branch.Link = "" // remove the link of branch if it doesn't exist'
lunny marked this conversation as resolved.
Show resolved Hide resolved
}
}

resp.State.Run.Commit = ViewCommit{
ShortSha: base.ShortSha(run.CommitSHA),
Link: fmt.Sprintf("%s/commit/%s", run.Repo.Link(), run.CommitSHA),
Expand Down
7 changes: 6 additions & 1 deletion web_src/js/components/RepoActionView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,12 @@ export function initRepositoryActionView() {
<a class="muted" :href="run.commit.pusher.link">{{ run.commit.pusher.displayName }}</a>
</template>
<span class="ui label tw-max-w-full" v-if="run.commit.shortSHA">
<a class="gt-ellipsis" :href="run.commit.branch.link">{{ run.commit.branch.name }}</a>
<template v-if="run.commit.branch.link">
<a class="gt-ellipsis" :href="run.commit.branch.link" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</a>
</template>
<template v-else>
<span class="gt-ellipsis tw-line-through" :data-tooltip-content="run.commit.branch.name">{{ run.commit.branch.name }}</span>
</template>
</span>
</div>
</div>
Expand Down
Loading