core
/
gitea
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Pagination of ListAccessTokens and GetIssueWatchers (#10449) 

* fix a pagination bug

* fix pagination of ListAccessTokens
This commit is contained in:
6543 2020-02-24 23:50:32 +01:00 committed by GitHub
parent 0eeee9c721
commit b65e954f73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/issue_watch.go
View File

@ -81,7 +81,7 @@ func GetIssueWatchers(issueID int64, listOptions ListOptions) (IssueWatchList, e
return getIssueWatchers(x, issueID, listOptions) return getIssueWatchers(x, issueID, listOptions)
} }
func getIssueWatchers(e Engine, issueID int64, listOptions ListOptions) (watches IssueWatchList, err error) { func getIssueWatchers(e Engine, issueID int64, listOptions ListOptions) (IssueWatchList, error) {
sess := e. sess := e.
Where("`issue_watch`.issue_id = ?", issueID). Where("`issue_watch`.issue_id = ?", issueID).
And("`issue_watch`.is_watching = ?", true). And("`issue_watch`.is_watching = ?", true).
@ -89,11 +89,13 @@ func getIssueWatchers(e Engine, issueID int64, listOptions ListOptions) (watches
And("`user`.prohibit_login = ?", false). And("`user`.prohibit_login = ?", false).
Join("INNER", "`user`", "`user`.id = `issue_watch`.user_id") Join("INNER", "`user`", "`user`.id = `issue_watch`.user_id")
if listOptions.Page == 0 { if listOptions.Page != 0 {
sess = listOptions.setSessionPagination(sess) sess = listOptions.setSessionPagination(sess)
watches := make([]*IssueWatch, 0, listOptions.PageSize)
return watches, sess.Find(&watches)
} }
err = sess.Find(&watches) watches := make([]*IssueWatch, 0, 8)
return return watches, sess.Find(&watches)
} }
func removeIssueWatchersByRepoID(e Engine, userID int64, repoID int64) error { func removeIssueWatchersByRepoID(e Engine, userID int64, repoID int64) error {

2
models/token.go
View File

@ -83,7 +83,7 @@ func ListAccessTokens(uid int64, listOptions ListOptions) ([]*AccessToken, error
Where("uid=?", uid). Where("uid=?", uid).
Desc("id") Desc("id")
if listOptions.Page == 0 { if listOptions.Page != 0 {
sess = listOptions.setSessionPagination(sess) sess = listOptions.setSessionPagination(sess)
tokens := make([]*AccessToken, 0, listOptions.PageSize) tokens := make([]*AccessToken, 0, listOptions.PageSize)