fix: notifier groups cache not initialized (#995)

nezhahq · Feb 17, 2025 · 029d6db · 029d6db
1 parent 65f9db7
commit 029d6db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/cmd/dashboard/controller/notification.go b/cmd/dashboard/controller/notification.go
@@ -163,6 +163,7 @@ func batchDeleteNotification(c *gin.Context) (any, error) {
 	for _, nid := range n {
 		if ns, ok := singleton.NotificationMap[nid]; ok {
 			if !ns.HasPermission(c) {
+				singleton.NotificationsLock.RUnlock()
 				return nil, singleton.Localizer.ErrorT("permission denied")
 			}
 		}

diff --git a/service/singleton/notification.go b/service/singleton/notification.go
@@ -54,6 +54,12 @@ func loadNotifications() {
 		panic(err)
 	}
 
+	var groups []model.NotificationGroup
+	DB.Find(&groups)
+	for _, grp := range groups {
+		NotificationGroup[grp.ID] = grp.Name
+	}
+
 	NotificationMap = make(map[uint64]*model.Notification, len(NotificationListSorted))
 	for i := range NotificationListSorted {
 		NotificationMap[NotificationListSorted[i].ID] = NotificationListSorted[i]