ignore missing comment for user notifications (#18954) * ignore missing comment for user notifications * instead fix bug in notifications model * use local variable instead Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: 6543 <6543@obermui.de>

Changes

2 changed files (+5/-4)

• models/notification.go
  • @@ -498,14 +498,15 @@ func (n *Notification) APIURL() string {
    type NotificationList []*Notification // LoadAttributes load Repo Issue User and Comment if not loaded - func (nl NotificationList) LoadAttributes() (err error) { + func (nl NotificationList) LoadAttributes() error { + var err error for i := 0; i < len(nl); i++ { err = nl[i].LoadAttributes() if err != nil && !IsErrCommentNotExist(err) { - return + return err } } - return + return nil } func (nl NotificationList) getPendingRepoIDs() []int64 {
• routers/api/v1/notify/repo.go
  • @@ -121,7 +121,7 @@ func ListRepoNotifications(ctx *context.APIContext) {
    return } err = nl.LoadAttributes() - if err != nil && !models.IsErrCommentNotExist(err) { + if err != nil { ctx.InternalServerError(err) return }