Fix bug

lunny · lunny · commit 6e60d24948ea · 2021-01-26T20:49:06.000+08:00
diff --git a/models/issue.go b/models/issue.go
@@ -1210,8 +1210,7 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) {
 	}
 
 	if opts.IsArchived != util.OptionalBoolNone {
-		sess.Join("INNER", "repository", "`issue`.repo_id = `repository`.id").
-			And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
+		sess.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})
 	}
 
 	if opts.LabelIDs != nil {
@@ -1293,6 +1292,8 @@ func GetRepoIDsForIssuesOptions(opts *IssuesOptions, user *User) ([]int64, error
 	sess := x.NewSession()
 	defer sess.Close()
 
+	sess.Join("INNER", "repository", "`issue`.repo_id = `repository`.id")
+
 	opts.setupSession(sess)
 
 	accessCond := accessibleRepositoryCondition(user)

Original file line number	Diff line number	Diff line change
`@@ -1210,8 +1210,7 @@ func (opts IssuesOptions) setupSession(sess xorm.Session) {`
`1210`	`1210`	`}`
`1211`	`1211`
`1212`	`1212`	`if opts.IsArchived != util.OptionalBoolNone {`
`1213`		- sess.Join("INNER", "repository", "`issue`.repo_id = `repository`.id").
`1214`		`- And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})`
	`1213`	`+ sess.And(builder.Eq{"repository.is_archived": opts.IsArchived.IsTrue()})`
`1215`	`1214`	`}`
`1216`	`1215`
`1217`	`1216`	`if opts.LabelIDs != nil {`
`@@ -1293,6 +1292,8 @@ func GetRepoIDsForIssuesOptions(opts IssuesOptions, user User) ([]int64, error`
`1293`	`1292`	`sess := x.NewSession()`
`1294`	`1293`	`defer sess.Close()`
`1295`	`1294`
	`1295`	+ sess.Join("INNER", "repository", "`issue`.repo_id = `repository`.id")
	`1296`	`+`
`1296`	`1297`	`opts.setupSession(sess)`
`1297`	`1298`
`1298`	`1299`	`accessCond := accessibleRepositoryCondition(user)`