From 1b421acf443257a6186e766abd374b373ecf2aa7 Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Wed, 2 Aug 2023 11:09:00 +0800 Subject: [PATCH 1/2] fix --- services/issue/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/issue/issue.go b/services/issue/issue.go index b6c6a26cbdc93..61b3e1825576a 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -248,7 +248,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue) error { issue.MilestoneID, err) } - if err := activities_model.DeleteIssueActions(ctx, issue.RepoID, issue.ID); err != nil { + if err := activities_model.DeleteIssueActions(ctx, issue.RepoID, issue.Index); err != nil { return err } From 68477935cbdbf45b4581d9074b2ba985b564c8fe Mon Sep 17 00:00:00 2001 From: CaiCandong <1290147055@qq.com> Date: Sat, 5 Aug 2023 20:00:36 +0800 Subject: [PATCH 2/2] fix sql error --- models/activities/action.go | 4 ++-- services/issue/issue.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/activities/action.go b/models/activities/action.go index 7f22605d0d15f..ad737c1e8d276 100644 --- a/models/activities/action.go +++ b/models/activities/action.go @@ -685,7 +685,7 @@ func NotifyWatchersActions(acts []*Action) error { } // DeleteIssueActions delete all actions related with issueID -func DeleteIssueActions(ctx context.Context, repoID, issueID int64) error { +func DeleteIssueActions(ctx context.Context, repoID, issueID, issueIndex int64) error { // delete actions assigned to this issue subQuery := builder.Select("`id`"). From("`comment`"). @@ -696,7 +696,7 @@ func DeleteIssueActions(ctx context.Context, repoID, issueID int64) error { _, err := db.GetEngine(ctx).Table("action").Where("repo_id = ?", repoID). In("op_type", ActionCreateIssue, ActionCreatePullRequest). - Where("content LIKE ?", strconv.FormatInt(issueID, 10)+"|%"). + Where("content LIKE ?", strconv.FormatInt(issueIndex, 10)+"|%"). Delete(&Action{}) return err } diff --git a/services/issue/issue.go b/services/issue/issue.go index 61b3e1825576a..9ca4e21b174ac 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -248,7 +248,7 @@ func deleteIssue(ctx context.Context, issue *issues_model.Issue) error { issue.MilestoneID, err) } - if err := activities_model.DeleteIssueActions(ctx, issue.RepoID, issue.Index); err != nil { + if err := activities_model.DeleteIssueActions(ctx, issue.RepoID, issue.ID, issue.Index); err != nil { return err }