domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix SQL bug in models.PullRequests

Browse source
This commit is contained in:
Ethan Koenig 2017-06-30 12:50:57 -04:00 • committed by Lauris BH
parent 3c0705ecf3
commit eae9154811
2 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
models/pull.go
View file

@ -688,8 +688,6 @@ func listPullRequestStatement(baseRepoID int64, opts *PullRequestsOptions) (*xor
sess.And("issue.is_closed=?", opts.State == "closed")
}
sortIssuesSession(sess, opts.SortType)
if labelIDs, err := base.StringsToInt64s(opts.Labels); err != nil {
return nil, err
} else if len(labelIDs) > 0 {
@ -723,6 +721,7 @@ func PullRequests(baseRepoID int64, opts *PullRequestsOptions) ([]*PullRequest,
prs := make([]*PullRequest, 0, ItemsPerPage)
findSession, err := listPullRequestStatement(baseRepoID, opts)
sortIssuesSession(findSession, opts.SortType)
if err != nil {
log.Error(4, "listPullRequestStatement", err)
return nil, maxResults, err