From 680437fbcae59471efd507dfc01b4de5490efe34 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 31 Mar 2026 10:12:15 +0800 Subject: [PATCH] fix merge --- services/projects/issue.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/projects/issue.go b/services/projects/issue.go index 8b138e5dba..377c4b9d58 100644 --- a/services/projects/issue.go +++ b/services/projects/issue.go @@ -12,7 +12,6 @@ import ( project_model "code.gitea.io/gitea/models/project" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/modules/util" ) // MoveIssuesOnProjectColumn moves or keeps issues in a column and sorts them inside that column @@ -104,9 +103,9 @@ func LoadIssuesFromProject(ctx context.Context, project *project_model.Project, return nil, err } - defaultColumn, err := project.GetDefaultColumnWithFallback(ctx) + defaultColumn, err := project.MustDefaultColumn(ctx) if err != nil { - return nil, util.Iif(errors.Is(err, util.ErrNotExist), nil, err) + return nil, err } issueColumnMap, err := issues_model.LoadProjectIssueColumnMap(ctx, project.ID, defaultColumn.ID)