Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jolheiser merged 2 commits into from
Mar 21, 2023
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4123ed2
Fix pagination on `/notifications/watching` (#23564)
silverwind Mar 21, 2023
cf74076
Merge branch 'release/v1.19' into backport-23564-v1.19
jolheiser Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion routers/web/user/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,9 @@ func NotificationWatching(ctx *context.Context) {
page = 1
}

keyword := ctx.FormTrim("q")
ctx.Data["Keyword"] = keyword

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