fix(subscriptions): don't crash when a project is already deleted
This commit is contained in:
parent
33a47b7f43
commit
d38050f2b8
@ -266,6 +266,11 @@ func getSubscriptionsForProjects(s *xorm.Session, projectIDs []int64, u *user.Us
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
ps[eID], err = GetProjectSimpleByID(s, eID)
|
ps[eID], err = GetProjectSimpleByID(s, eID)
|
||||||
|
if err != nil && IsErrProjectDoesNotExist(err) {
|
||||||
|
// If the project does not exist, it might got deleted. There could still be subscribers though.
|
||||||
|
delete(ps, eID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@ -314,6 +319,10 @@ func getSubscriptionsForProjects(s *xorm.Session, projectIDs []int64, u *user.Us
|
|||||||
_, has := projectsToSubscriptions[eID]
|
_, has := projectsToSubscriptions[eID]
|
||||||
_, hasProject := ps[eID]
|
_, hasProject := ps[eID]
|
||||||
if !has && hasProject {
|
if !has && hasProject {
|
||||||
|
_, exists := ps[eID]
|
||||||
|
if !exists {
|
||||||
|
continue
|
||||||
|
}
|
||||||
var parent = ps[eID].ParentProject
|
var parent = ps[eID].ParentProject
|
||||||
for parent != nil {
|
for parent != nil {
|
||||||
sub, has := projectsToSubscriptions[parent.ID]
|
sub, has := projectsToSubscriptions[parent.ID]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user