Remove AddParamIfExist(AddParam) (#29841)
Follow #29834 Remove AddParamIfExist, use "AddParamString" instead, it should clearly know what is being added into the parameters.
This commit is contained in:
parent
66902d89e5
commit
a889381664
17 changed files with 55 additions and 58 deletions
|
@ -133,7 +133,7 @@ func Dashboard(ctx *context.Context) {
|
|||
ctx.Data["Feeds"] = feeds
|
||||
|
||||
pager := context.NewPagination(int(count), setting.UI.FeedPagingNum, page, 5)
|
||||
pager.AddParamIfExist("date", ctx.Data["Date"])
|
||||
pager.AddParamString("date", date)
|
||||
ctx.Data["Page"] = pager
|
||||
|
||||
ctx.HTML(http.StatusOK, tplDashboard)
|
||||
|
@ -329,10 +329,10 @@ func Milestones(ctx *context.Context) {
|
|||
ctx.Data["IsShowClosed"] = isShowClosed
|
||||
|
||||
pager := context.NewPagination(pagerCount, setting.UI.IssuePagingNum, page, 5)
|
||||
pager.AddParamIfExist("q", ctx.Data["Keyword"])
|
||||
pager.AddParamIfExist("repos", ctx.Data["RepoIDs"])
|
||||
pager.AddParamIfExist("sort", ctx.Data["SortType"])
|
||||
pager.AddParamIfExist("state", ctx.Data["State"])
|
||||
pager.AddParamString("q", keyword)
|
||||
pager.AddParamString("repos", reposQuery)
|
||||
pager.AddParamString("sort", sortType)
|
||||
pager.AddParamString("state", fmt.Sprint(ctx.Data["State"]))
|
||||
ctx.Data["Page"] = pager
|
||||
|
||||
ctx.HTML(http.StatusOK, tplMilestones)
|
||||
|
@ -632,13 +632,11 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
|
|||
}
|
||||
|
||||
pager := context.NewPagination(shownIssues, setting.UI.IssuePagingNum, page, 5)
|
||||
pager.AddParamIfExist("q", ctx.Data["Keyword"])
|
||||
pager.AddParamIfExist("type", ctx.Data["ViewType"])
|
||||
pager.AddParamIfExist("sort", ctx.Data["SortType"])
|
||||
pager.AddParamIfExist("state", ctx.Data["State"])
|
||||
pager.AddParamIfExist("labels", ctx.Data["SelectLabels"])
|
||||
pager.AddParamIfExist("milestone", ctx.Data["MilestoneID"])
|
||||
pager.AddParamIfExist("assignee", ctx.Data["AssigneeID"])
|
||||
pager.AddParamString("q", keyword)
|
||||
pager.AddParamString("type", viewType)
|
||||
pager.AddParamString("sort", sortType)
|
||||
pager.AddParamString("state", fmt.Sprint(ctx.Data["State"]))
|
||||
pager.AddParamString("labels", selectedLabels)
|
||||
ctx.Data["Page"] = pager
|
||||
|
||||
ctx.HTML(http.StatusOK, tplIssues)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue