Skip to content

Commit 3dedc02

Browse files
lunny0xBAADF00D
authored andcommitted
Bug fixed for issues (#156)
1 parent 54e6ed3 commit 3dedc02

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

models/issue.go

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -820,20 +820,12 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
820820
sess := x.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum)
821821

822822
if opts.RepoID > 0 {
823-
sess.
824-
Where("issue.repo_id=?", opts.RepoID).
825-
And("issue.is_closed=?", opts.IsClosed)
826-
} else if opts.RepoIDs != nil {
823+
sess.And("issue.repo_id=?", opts.RepoID)
824+
} else if len(opts.RepoIDs) > 0 {
827825
// In case repository IDs are provided but actually no repository has issue.
828-
if len(opts.RepoIDs) == 0 {
829-
return make([]*Issue, 0), nil
830-
}
831-
sess.
832-
In("issue.repo_id", opts.RepoIDs).
833-
And("issue.is_closed=?", opts.IsClosed)
834-
} else {
835-
sess.Where("issue.is_closed=?", opts.IsClosed)
826+
sess.In("issue.repo_id", opts.RepoIDs)
836827
}
828+
sess.And("issue.is_closed=?", opts.IsClosed)
837829

838830
if opts.AssigneeID > 0 {
839831
sess.And("issue.assignee_id=?", opts.AssigneeID)
@@ -1185,9 +1177,9 @@ func GetUserIssueStats(repoID, uid int64, repoIDs []int64, filterMode int, isPul
11851177
Where("issue.is_closed = ?", isClosed).
11861178
And("issue.is_pull = ?", isPull)
11871179

1188-
if repoID > 0 || len(repoIDs) == 0 {
1180+
if repoID > 0 {
11891181
sess.And("repo_id = ?", repoID)
1190-
} else {
1182+
} else if len(repoIDs) > 0 {
11911183
sess.In("repo_id", repoIDs)
11921184
}
11931185

0 commit comments

Comments
 (0)