mirror of
https://github.com/go-gitea/gitea.git
synced 2026-04-04 10:05:18 +02:00
fix merge
This commit is contained in:
parent
321643c9d4
commit
680437fbca
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user