From fc3d0826096943b979717ed46c9a4cfd86e06106 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 19 Nov 2021 21:39:57 +0800 Subject: Move attachment into models/repo/ (#17650) * Move attachment into models/repo/ * Fix test * Fix bug --- models/issue_list.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'models/issue_list.go') diff --git a/models/issue_list.go b/models/issue_list.go index 04dcc58422..6eeb2a961a 100644 --- a/models/issue_list.go +++ b/models/issue_list.go @@ -8,6 +8,7 @@ import ( "fmt" "code.gitea.io/gitea/models/db" + repo_model "code.gitea.io/gitea/models/repo" "xorm.io/builder" ) @@ -322,7 +323,7 @@ func (issues IssueList) loadAttachments(e db.Engine) (err error) { return nil } - attachments := make(map[int64][]*Attachment, len(issues)) + attachments := make(map[int64][]*repo_model.Attachment, len(issues)) issuesIDs := issues.getIssueIDs() left := len(issuesIDs) for left > 0 { @@ -333,13 +334,13 @@ func (issues IssueList) loadAttachments(e db.Engine) (err error) { rows, err := e.Table("attachment"). Join("INNER", "issue", "issue.id = attachment.issue_id"). In("issue.id", issuesIDs[:limit]). - Rows(new(Attachment)) + Rows(new(repo_model.Attachment)) if err != nil { return err } for rows.Next() { - var attachment Attachment + var attachment repo_model.Attachment err = rows.Scan(&attachment) if err != nil { if err1 := rows.Close(); err1 != nil { -- cgit v1.2.3