From 4e471487fbc680c89985d6afa10724e53739ae8b Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 4 Jun 2025 00:27:29 +0800 Subject: [PATCH] Remove unnecessary duplicate code (#34552) `GetIssuesLastCommitStatus` will revoke `GetIssuesAllCommitStatus` but it has been invoked. The `CommitStatus` template variable has never been used in notification subscription page so that it could be removed. --- routers/web/user/notification.go | 8 -------- services/pull/pull.go | 6 ------ 2 files changed, 14 deletions(-) diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index be285bf4f5..2b758ba461 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -287,16 +287,8 @@ func NotificationSubscriptions(ctx *context.Context) { ctx.Data["CommitLastStatus"] = lastStatus ctx.Data["CommitStatuses"] = commitStatuses ctx.Data["Issues"] = issues - ctx.Data["IssueRefEndNames"], ctx.Data["IssueRefURLs"] = issue_service.GetRefEndNamesAndURLs(issues, "") - commitStatus, err := pull_service.GetIssuesLastCommitStatus(ctx, issues) - if err != nil { - ctx.ServerError("GetIssuesLastCommitStatus", err) - return - } - ctx.Data["CommitStatus"] = commitStatus - approvalCounts, err := issues.GetApprovalCounts(ctx) if err != nil { ctx.ServerError("ApprovalCounts", err) diff --git a/services/pull/pull.go b/services/pull/pull.go index f879f61136..701c4f4d32 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -945,12 +945,6 @@ func GetSquashMergeCommitMessages(ctx context.Context, pr *issues_model.PullRequ return stringBuilder.String() } -// GetIssuesLastCommitStatus returns a map of issue ID to the most recent commit's latest status -func GetIssuesLastCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64]*git_model.CommitStatus, error) { - _, lastStatus, err := GetIssuesAllCommitStatus(ctx, issues) - return lastStatus, err -} - // GetIssuesAllCommitStatus returns a map of issue ID to a list of all statuses for the most recent commit as well as a map of issue ID to only the commit's latest status func GetIssuesAllCommitStatus(ctx context.Context, issues issues_model.IssueList) (map[int64][]*git_model.CommitStatus, map[int64]*git_model.CommitStatus, error) { if err := issues.LoadPullRequests(ctx); err != nil {