test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

fix issue paging

This commit is contained in:
Unknwon 2015-07-25 07:59:54 +08:00
parent c0883a51a0
commit 68cacf9c63
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
routers/repo/issue.go
View File

@ -93,20 +93,21 @@ func Issues(ctx *middleware.Context) {
} }
repo := ctx.Repo.Repository repo := ctx.Repo.Repository
selectLabels := ctx.Query("labels")
milestoneID := ctx.QueryInt64("milestone") milestoneID := ctx.QueryInt64("milestone")
issueStats := models.GetIssueStats(repo.Id, uid, com.StrTo(selectLabels).MustInt64(), isShowClosed, filterMode)
page := ctx.QueryInt("page") page := ctx.QueryInt("page")
if page <= 1 { if page <= 1 {
page = 1 page = 1
} else { } else {
ctx.Data["PreviousPage"] = page - 1 ctx.Data["PreviousPage"] = page - 1
} }
if (!isShowClosed && repo.NumOpenIssues > setting.IssuePagingNum*page) || if (!isShowClosed && int(issueStats.OpenCount) > setting.IssuePagingNum*page) ||
(isShowClosed && repo.NumClosedIssues > setting.IssuePagingNum*page) { (isShowClosed && int(issueStats.ClosedCount) > setting.IssuePagingNum*page) {
ctx.Data["NextPage"] = page + 1 ctx.Data["NextPage"] = page + 1
} }
selectLabels := ctx.Query("labels")
// Get issues. // Get issues.
issues, err := models.GetIssues(uid, assigneeID, repo.Id, posterID, milestoneID, issues, err := models.GetIssues(uid, assigneeID, repo.Id, posterID, milestoneID,
page, isShowClosed, filterMode == models.FM_MENTION, selectLabels, ctx.Query("sortType")) page, isShowClosed, filterMode == models.FM_MENTION, selectLabels, ctx.Query("sortType"))
@ -148,7 +149,6 @@ func Issues(ctx *middleware.Context) {
} }
} }
issueStats := models.GetIssueStats(repo.Id, uid, com.StrTo(selectLabels).MustInt64(), isShowClosed, filterMode)
ctx.Data["IssueStats"] = issueStats ctx.Data["IssueStats"] = issueStats
ctx.Data["SelectLabels"] = com.StrTo(selectLabels).MustInt64() ctx.Data["SelectLabels"] = com.StrTo(selectLabels).MustInt64()
ctx.Data["ViewType"] = viewType ctx.Data["ViewType"] = viewType