Merge branch 'main' into bugfix/issue_26360

go-gitea · Aug 7, 2023 · 827f8fb · 827f8fb
2 parents 8affe94 + f5dbac9
commit 827f8fb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/models/issues/issue.go b/models/issues/issue.go
@@ -854,8 +854,8 @@ func (issue *Issue) MovePin(ctx context.Context, newPosition int) error {
 }
 
 // GetPinnedIssues returns the pinned Issues for the given Repo and type
-func GetPinnedIssues(ctx context.Context, repoID int64, isPull bool) ([]*Issue, error) {
-	issues := make([]*Issue, 0)
+func GetPinnedIssues(ctx context.Context, repoID int64, isPull bool) (IssueList, error) {
+	issues := make(IssueList, 0)
 
 	err := db.GetEngine(ctx).
 		Table("issue").
@@ -868,7 +868,7 @@ func GetPinnedIssues(ctx context.Context, repoID int64, isPull bool) ([]*Issue,
 		return nil, err
 	}
 
-	err = IssueList(issues).LoadAttributes(ctx)
+	err = issues.LoadAttributes(ctx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/models/issues/issue_project.go b/models/issues/issue_project.go
@@ -53,7 +53,7 @@ func (issue *Issue) projectBoardID(ctx context.Context) int64 {
 
 // LoadIssuesFromBoard load issues assigned to this board
 func LoadIssuesFromBoard(ctx context.Context, b *project_model.Board) (IssueList, error) {
-	issueList := make([]*Issue, 0, 10)
+	issueList := make(IssueList, 0, 10)
 
 	if b.ID != 0 {
 		issues, err := Issues(ctx, &IssuesOptions{
@@ -79,7 +79,7 @@ func LoadIssuesFromBoard(ctx context.Context, b *project_model.Board) (IssueList
 		issueList = append(issueList, issues...)
 	}
 
-	if err := IssueList(issueList).LoadComments(ctx); err != nil {
+	if err := issueList.LoadComments(ctx); err != nil {
 		return nil, err
 	}
 

diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go
@@ -441,7 +441,7 @@ func GetRepoIDsForIssuesOptions(opts *IssuesOptions, user *user_model.User) ([]i
 }
 
 // Issues returns a list of issues by given conditions.
-func Issues(ctx context.Context, opts *IssuesOptions) ([]*Issue, error) {
+func Issues(ctx context.Context, opts *IssuesOptions) (IssueList, error) {
 	sess := db.GetEngine(ctx).
 		Join("INNER", "repository", "`issue`.repo_id = `repository`.id")
 	applyLimit(sess, opts)

diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
@@ -296,8 +296,7 @@ func NotificationSubscriptions(ctx *context.Context) {
 	}
 	ctx.Data["CommitStatus"] = commitStatus
 
-	issueList := issues_model.IssueList(issues)
-	approvalCounts, err := issueList.GetApprovalCounts(ctx)
+	approvalCounts, err := issues.GetApprovalCounts(ctx)
 	if err != nil {
 		ctx.ServerError("ApprovalCounts", err)
 		return