Bug fixed for deleted label in issue comment (#904)
* bug fixed for deleted label in issue comment * fix indent
This commit is contained in:
parent
442145dbd3
commit
8a0be5e9f0
3 changed files with 21 additions and 13 deletions
|
@ -214,12 +214,13 @@ func (c *Comment) LoadLabel() error {
|
|||
has, err := x.ID(c.LabelID).Get(&label)
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !has {
|
||||
return ErrLabelNotExist{
|
||||
LabelID: c.LabelID,
|
||||
}
|
||||
} else if has {
|
||||
c.Label = &label
|
||||
} else {
|
||||
// Ignore Label is deleted, but not clear this table
|
||||
log.Warn("Commit %d cannot load label %d", c.ID, c.LabelID)
|
||||
}
|
||||
c.Label = &label
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -249,6 +249,11 @@ func DeleteLabel(repoID, labelID int64) error {
|
|||
return err
|
||||
}
|
||||
|
||||
// Clear label id in comment table
|
||||
if _, err = sess.Where("label_id = ?", labelID).Cols("label_id").Update(&Comment{}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return sess.Commit()
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue