Skip to content
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

Ignore missing comment for user notifications #18954

Merged
merged 8 commits into from
Mar 3, 2022
Merged

Ignore missing comment for user notifications #18954

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a3543d
ignore missing comment for user notifications
eladyn Mar 1, 2022
1a1b57f
instead fix bug in notifications model
eladyn Mar 2, 2022
0edc5f6
use local variable instead
eladyn Mar 2, 2022
fb086b2
Merge branch 'main' into fix_notifications_missing_comment
lunny Mar 2, 2022
64c40fb
Merge branch 'main' into fix_notifications_missing_comment
6543 Mar 2, 2022
9615b86
Merge branch 'main' into fix_notifications_missing_comment
6543 Mar 2, 2022
192efe1
Merge branch 'main' into fix_notifications_missing_comment
lunny Mar 3, 2022
f79e03c
Merge branch 'main' into fix_notifications_missing_comment
6543 Mar 3, 2022
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
7 changes: 4 additions & 3 deletions models/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion routers/api/v1/notify/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down