Fix #185
This commit is contained in:
parent
b0084b1adc
commit
9100786beb
3 changed files with 22 additions and 10 deletions
|
@ -676,6 +676,14 @@ func DeleteRepository(userId, repoId int64, userName string) (err error) {
|
||||||
sess.Rollback()
|
sess.Rollback()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if _, err = sess.Delete(&Issue{RepoId: repoId}); err != nil {
|
||||||
|
sess.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err = sess.Delete(&IssueUser{RepoId: repoId}); err != nil {
|
||||||
|
sess.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
rawSql := "UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?"
|
rawSql := "UPDATE `user` SET num_repos = num_repos - 1 WHERE id = ?"
|
||||||
if _, err = sess.Exec(rawSql, userId); err != nil {
|
if _, err = sess.Exec(rawSql, userId); err != nil {
|
||||||
|
|
|
@ -337,18 +337,18 @@ func UpdateAssignee(ctx *middleware.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
idx, err := base.StrTo(ctx.Query("issue")).Int64()
|
issueId, err := base.StrTo(ctx.Query("issue")).Int64()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(404)
|
ctx.Error(404)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
issue, err := models.GetIssueByIndex(ctx.Repo.Repository.Id, idx)
|
issue, err := models.GetIssueById(issueId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err == models.ErrIssueNotExist {
|
if err == models.ErrIssueNotExist {
|
||||||
ctx.Handle(404, "issue.UpdateAssignee", err)
|
ctx.Handle(404, "issue.UpdateAssignee(GetIssueById)", err)
|
||||||
} else {
|
} else {
|
||||||
ctx.Handle(500, "issue.UpdateAssignee(GetIssueByIndex)", err)
|
ctx.Handle(500, "issue.UpdateAssignee(GetIssueById)", err)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -221,27 +221,31 @@ func Issues(ctx *middleware.Context) {
|
||||||
issues[i], err = models.GetIssueById(ius[i].IssueId)
|
issues[i], err = models.GetIssueById(ius[i].IssueId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err == models.ErrIssueNotExist {
|
if err == models.ErrIssueNotExist {
|
||||||
log.Error("user.Issues(#%d): issue not exist", ius[i].IssueId)
|
log.Warn("user.Issues(GetIssueById #%d): issue not exist", ius[i].IssueId)
|
||||||
continue
|
continue
|
||||||
} else {
|
} else {
|
||||||
ctx.Handle(500, "user.Issues(GetIssue)", err)
|
ctx.Handle(500, fmt.Sprintf("user.Issues(GetIssueById #%d)", ius[i].IssueId), err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
issues[i].Repo, err = models.GetRepositoryById(issues[i].RepoId)
|
issues[i].Repo, err = models.GetRepositoryById(issues[i].RepoId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Handle(500, "user.Issues(GetRepositoryById)", err)
|
if err == models.ErrRepoNotExist {
|
||||||
|
log.Warn("user.Issues(GetRepositoryById #%d): repository not exist", issues[i].RepoId)
|
||||||
|
continue
|
||||||
|
} else {
|
||||||
|
ctx.Handle(500, fmt.Sprintf("user.Issues(GetRepositoryById #%d)", issues[i].RepoId), err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if err = issues[i].Repo.GetOwner(); err != nil {
|
if err = issues[i].Repo.GetOwner(); err != nil {
|
||||||
ctx.Handle(500, "user.Issues(GetOwner)", err)
|
ctx.Handle(500, "user.Issues(GetOwner)", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
issues[i].Poster, err = models.GetUserById(issues[i].PosterId)
|
if err = issues[i].GetPoster(); err != nil {
|
||||||
if err != nil {
|
|
||||||
ctx.Handle(500, "user.Issues(GetUserById)", err)
|
ctx.Handle(500, "user.Issues(GetUserById)", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue