Skip to content

Commit 2489b1e

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent e0ea381 commit 2489b1e

File tree

17 files changed

+55
-58
lines changed

17 files changed

+55
-58
lines changed

‎routers/web/admin/repos.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package admin
55

66
import (
7+
"fmt"
78
"net/http"
89
"net/url"
910
"strings"
@@ -84,7 +85,7 @@ func UnadoptedRepos(ctx *context.Context) {
8485
if !doSearch {
8586
pager := context.NewPagination(0, opts.PageSize, opts.Page, 5)
8687
pager.SetDefaultParams(ctx)
87-
pager.AddParamIfExist("search", ctx.Data["search"])
88+
pager.AddParamString("search", fmt.Sprint(doSearch))
8889
ctx.Data["Page"] = pager
8990
ctx.HTML(http.StatusOK, tplUnadoptedRepos)
9091
return
@@ -98,7 +99,7 @@ func UnadoptedRepos(ctx *context.Context) {
9899
ctx.Data["Dirs"] = repoNames
99100
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
100101
pager.SetDefaultParams(ctx)
101-
pager.AddParamIfExist("search", ctx.Data["search"])
102+
pager.AddParamString("search", fmt.Sprint(doSearch))
102103
ctx.Data["Page"] = pager
103104
ctx.HTML(http.StatusOK, tplUnadoptedRepos)
104105
}

‎routers/web/explore/code.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func Code(ctx *context.Context) {
127127

128128
pager := context.NewPagination(total, setting.UI.RepoSearchPagingNum, page, 5)
129129
pager.SetDefaultParams(ctx)
130-
pager.AddParamIfExist("l", ctx.Data["Language"])
130+
pager.AddParamString("l", language)
131131
ctx.Data["Page"] = pager
132132

133133
ctx.HTML(http.StatusOK, tplExploreCode)

‎routers/web/explore/repo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
169169

170170
pager := context.NewPagination(int(count), opts.PageSize, page, 5)
171171
pager.SetDefaultParams(ctx)
172-
pager.AddParamIfExist("topic", ctx.Data["TopicOnly"])
173-
pager.AddParamIfExist("language", ctx.Data["Language"])
172+
pager.AddParamString("topic", fmt.Sprint(topicOnly))
173+
pager.AddParamString("language", language)
174174
pager.AddParamString(relevantReposOnlyParam, fmt.Sprint(opts.OnlyShowRelevant))
175175
ctx.Data["Page"] = pager
176176

‎routers/web/org/home.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func Home(ctx *context.Context) {
154154

155155
pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)
156156
pager.SetDefaultParams(ctx)
157-
pager.AddParamIfExist("language", ctx.Data["Language"])
157+
pager.AddParamString("language", language)
158158
ctx.Data["Page"] = pager
159159

160160
ctx.Data["ShowMemberAndTeamTab"] = ctx.Org.IsMember || len(members) > 0

‎routers/web/org/projects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func Projects(ctx *context.Context) {
120120
}
121121

122122
pager := context.NewPagination(int(total), setting.UI.IssuePagingNum, page, numPages)
123-
pager.AddParamIfExist("state", ctx.Data["State"])
123+
pager.AddParamString("state", fmt.Sprint(ctx.Data["State"]))
124124
ctx.Data["Page"] = pager
125125

126126
ctx.Data["CanWriteProjects"] = canWriteProjects(ctx)

‎routers/web/repo/commit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ func Graph(ctx *context.Context) {
163163
ctx.Data["CommitCount"] = commitsCount
164164

165165
paginator := context.NewPagination(int(graphCommitsCount), setting.UI.GraphMaxCommitNum, page, 5)
166-
paginator.AddParamIfExist("mode", ctx.Data["Mode"])
167-
paginator.AddParamIfExist("hide-pr-refs", ctx.Data["HidePRRefs"])
166+
paginator.AddParamString("mode", mode)
167+
paginator.AddParamString("hide-pr-refs", fmt.Sprint(hidePRRefs))
168168
for _, branch := range branches {
169169
paginator.AddParamString("branch", branch)
170170
}

‎routers/web/repo/issue.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -472,16 +472,16 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption opt
472472
}
473473
ctx.Data["ShowArchivedLabels"] = archived
474474

475-
pager.AddParamIfExist("q", ctx.Data["Keyword"])
476-
pager.AddParamIfExist("type", ctx.Data["ViewType"])
477-
pager.AddParamIfExist("sort", ctx.Data["SortType"])
478-
pager.AddParamIfExist("state", ctx.Data["State"])
479-
pager.AddParamIfExist("labels", ctx.Data["SelectLabels"])
480-
pager.AddParamIfExist("milestone", ctx.Data["MilestoneID"])
481-
pager.AddParamIfExist("project", ctx.Data["ProjectID"])
482-
pager.AddParamIfExist("assignee", ctx.Data["AssigneeID"])
483-
pager.AddParamIfExist("poster", ctx.Data["PosterID"])
484-
pager.AddParamIfExist("archived", ctx.Data["ShowArchivedLabels"])
475+
pager.AddParamString("q", keyword)
476+
pager.AddParamString("type", viewType)
477+
pager.AddParamString("sort", sortType)
478+
pager.AddParamString("state", fmt.Sprint(ctx.Data["State"]))
479+
pager.AddParamString("labels", fmt.Sprint(selectLabels))
480+
pager.AddParamString("milestone", fmt.Sprint(milestoneID))
481+
pager.AddParamString("project", fmt.Sprint(projectID))
482+
pager.AddParamString("assignee", fmt.Sprint(assigneeID))
483+
pager.AddParamString("poster", fmt.Sprint(posterID))
484+
pager.AddParamString("archived", fmt.Sprint(archived))
485485

486486
ctx.Data["Page"] = pager
487487
}

‎routers/web/repo/milestone.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ func Milestones(ctx *context.Context) {
106106
ctx.Data["IsShowClosed"] = isShowClosed
107107

108108
pager := context.NewPagination(int(total), setting.UI.IssuePagingNum, page, 5)
109-
pager.AddParamIfExist("state", ctx.Data["State"])
110-
pager.AddParamIfExist("q", ctx.Data["Keyword"])
109+
pager.AddParamString("state", fmt.Sprint(ctx.Data["State"]))
110+
pager.AddParamString("q", keyword)
111111
ctx.Data["Page"] = pager
112112

113113
ctx.HTML(http.StatusOK, tplMilestone)

‎routers/web/repo/packages.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ func Packages(ctx *context.Context) {
7070
ctx.Data["RepositoryAccessMap"] = map[int64]bool{ctx.Repo.Repository.ID: true} // There is only the current repository
7171

7272
pager := context.NewPagination(int(total), setting.UI.PackagesPagingNum, page, 5)
73-
pager.AddParamIfExist("q", ctx.Data["Query"])
74-
pager.AddParamIfExist("type", ctx.Data["PackageType"])
73+
pager.AddParamString("q", query)
74+
pager.AddParamString("type", packageType)
7575
ctx.Data["Page"] = pager
7676

7777
ctx.HTML(http.StatusOK, tplPackagesList)

‎routers/web/repo/projects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func Projects(ctx *context.Context) {
118118
}
119119

120120
pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, numPages)
121-
pager.AddParamIfExist("state", ctx.Data["State"])
121+
pager.AddParamString("state", fmt.Sprint(ctx.Data["State"]))
122122
ctx.Data["Page"] = pager
123123

124124
ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)

0 commit comments

Comments
 (0)