femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Fix pagination on /notifications/watching (#23564) (#23603)

Browse source 
Backport #23564 by @silverwind

The `q` parameter was not rendered in pagination links because
`context.Pagination:AddParam` checks for existance of the parameter in
`ctx.Data` where it was absent. Added the parameter there to fix it.

Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
Giteabot 2023-03-21 16:10:47 -04:00 committed by GitHub
parent 782c376c8b
commit 4439a68911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
routers/web/user/notification.go
View file

@ -344,6 +344,9 @@ func NotificationWatching(ctx *context.Context) {
page = 1 page = 1
} }
keyword := ctx.FormTrim("q")
ctx.Data["Keyword"] = keyword
var orderBy db.SearchOrderBy var orderBy db.SearchOrderBy
ctx.Data["SortType"] = ctx.FormString("sort") ctx.Data["SortType"] = ctx.FormString("sort")
switch ctx.FormString("sort") { switch ctx.FormString("sort") {
@ -378,7 +381,7 @@ func NotificationWatching(ctx *context.Context) {
Page: page, Page: page,
}, },
Actor: ctx.Doer, Actor: ctx.Doer,
Keyword: ctx.FormTrim("q"), Keyword: keyword,
OrderBy: orderBy, OrderBy: orderBy,
Private: ctx.IsSigned, Private: ctx.IsSigned,
WatchedByID: ctx.Doer.ID, WatchedByID: ctx.Doer.ID,