Fix 500 when a comment was deleted which has a notification (#17550)
* Fix 500 when a comment was deleted which has a notification * Tolerate missing Comment in other places too Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Andrew Thornton <art27@cantab.net> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
parent
33fca2b537
commit
43bbc54783
@ -434,7 +434,13 @@ func (n *Notification) loadComment(e db.Engine) (err error) {
|
|||||||
if n.Comment == nil && n.CommentID != 0 {
|
if n.Comment == nil && n.CommentID != 0 {
|
||||||
n.Comment, err = getCommentByID(e, n.CommentID)
|
n.Comment, err = getCommentByID(e, n.CommentID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("GetCommentByID [%d] for issue ID [%d]: %v", n.CommentID, n.IssueID, err)
|
if IsErrCommentNotExist(err) {
|
||||||
|
return ErrCommentNotExist{
|
||||||
|
ID: n.CommentID,
|
||||||
|
IssueID: n.IssueID,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@ -488,7 +494,7 @@ type NotificationList []*Notification
|
|||||||
func (nl NotificationList) LoadAttributes() (err error) {
|
func (nl NotificationList) LoadAttributes() (err error) {
|
||||||
for i := 0; i < len(nl); i++ {
|
for i := 0; i < len(nl); i++ {
|
||||||
err = nl[i].LoadAttributes()
|
err = nl[i].LoadAttributes()
|
||||||
if err != nil {
|
if err != nil && !IsErrCommentNotExist(err) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ func ListRepoNotifications(ctx *context.APIContext) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
err = nl.LoadAttributes()
|
err = nl.LoadAttributes()
|
||||||
if err != nil {
|
if err != nil && !models.IsErrCommentNotExist(err) {
|
||||||
ctx.InternalServerError(err)
|
ctx.InternalServerError(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -40,7 +40,7 @@ func GetThread(ctx *context.APIContext) {
|
|||||||
if n == nil {
|
if n == nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := n.LoadAttributes(); err != nil {
|
if err := n.LoadAttributes(); err != nil && !models.IsErrCommentNotExist(err) {
|
||||||
ctx.InternalServerError(err)
|
ctx.InternalServerError(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -92,7 +92,7 @@ func ReadThread(ctx *context.APIContext) {
|
|||||||
ctx.InternalServerError(err)
|
ctx.InternalServerError(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err = notif.LoadAttributes(); err != nil {
|
if err = notif.LoadAttributes(); err != nil && !models.IsErrCommentNotExist(err) {
|
||||||
ctx.InternalServerError(err)
|
ctx.InternalServerError(err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user