From 84c78650cc2d7c6480f397d59e1d4e33a5f71d19 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 10 Jul 2023 02:42:31 +0800 Subject: [PATCH] Fix notification list bugs (#25781) Fix #25627 1. `ctx.Data["Link"]` should use relative URL but not AppURL 2. The `data-params` is incorrect because it doesn't contain "page". JS can simply use "window.location.search" to construct the AJAX URL 3. The `data-xxx` and `id` in notification_subscriptions.tmpl were copied&pasted, they don't have affect. --- routers/web/user/notification.go | 2 +- templates/user/notification/notification_div.tmpl | 2 +- templates/user/notification/notification_subscriptions.tmpl | 2 +- web_src/js/features/notification.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go index e0aa92879..cae12f412 100644 --- a/routers/web/user/notification.go +++ b/routers/web/user/notification.go @@ -186,7 +186,7 @@ func NotificationStatusPost(ctx *context.Context) { if ctx.Written() { return } - ctx.Data["Link"] = setting.AppURL + "notifications" + ctx.Data["Link"] = setting.AppSubURL + "/notifications" ctx.Data["SequenceNumber"] = ctx.Req.PostFormValue("sequence-number") ctx.HTML(http.StatusOK, tplNotificationDiv) diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl index a8c070d76..3cc9d31d5 100644 --- a/templates/user/notification/notification_div.tmpl +++ b/templates/user/notification/notification_div.tmpl @@ -1,4 +1,4 @@ -
+
{{$notificationUnreadCount := call .NotificationUnreadCount}}