MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-02-07 01:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix unnecessary comment when moving issue on the same project column (#33496) (#33499)

Browse Source 
Backport #33496 by @lunny

Fix #33482

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Giteabot 2025-02-05 12:41:48 +08:00 committed by GitHub
parent 200cb6140d
commit 2df7d0835a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
models/issues/issue_project.go
View File

@ -38,13 +38,15 @@ func (issue *Issue) projectID(ctx context.Context) int64 {
} }
// ProjectColumnID return project column id if issue was assigned to one // ProjectColumnID return project column id if issue was assigned to one
func (issue *Issue) ProjectColumnID(ctx context.Context) int64 { func (issue *Issue) ProjectColumnID(ctx context.Context) (int64, error) {
var ip project_model.ProjectIssue var ip project_model.ProjectIssue
has, err := db.GetEngine(ctx).Where("issue_id=?", issue.ID).Get(&ip) has, err := db.GetEngine(ctx).Where("issue_id=?", issue.ID).Get(&ip)
if err != nil || !has { if err != nil {
return 0 return 0, err
} else if !has {
return 0, nil
} }
return ip.ProjectColumnID return ip.ProjectColumnID, nil
} }
// LoadIssuesFromColumn load issues assigned to this column // LoadIssuesFromColumn load issues assigned to this column

7
modules/indexer/issues/util.go
View File

@ -92,6 +92,11 @@ func getIssueIndexerData(ctx context.Context, issueID int64) (*internal.IndexerD
projectID = issue.Project.ID projectID = issue.Project.ID
} }
projectColumnID, err := issue.ProjectColumnID(ctx)
if err != nil {
return nil, false, err
}
return &internal.IndexerData{ return &internal.IndexerData{
ID: issue.ID, ID: issue.ID,
RepoID: issue.RepoID, RepoID: issue.RepoID,
@ -106,7 +111,7 @@ func getIssueIndexerData(ctx context.Context, issueID int64) (*internal.IndexerD
NoLabel: len(labels) == 0, NoLabel: len(labels) == 0,
MilestoneID: issue.MilestoneID, MilestoneID: issue.MilestoneID,
ProjectID: projectID, ProjectID: projectID,
ProjectColumnID: issue.ProjectColumnID(ctx), ProjectColumnID: projectColumnID,
PosterID: issue.PosterID, PosterID: issue.PosterID,
AssigneeID: issue.AssigneeID, AssigneeID: issue.AssigneeID,
MentionIDs: mentionIDs, MentionIDs: mentionIDs,

31
services/projects/issue.go
View File

@ -55,22 +55,29 @@ func MoveIssuesOnProjectColumn(ctx context.Context, doer *user_model.User, colum
continue continue
} }
_, err = db.Exec(ctx, "UPDATE `project_issue` SET project_board_id=?, sorting=? WHERE issue_id=?", column.ID, sorting, issueID) projectColumnID, err := curIssue.ProjectColumnID(ctx)
if err != nil { if err != nil {
return err return err
} }
// add timeline to issue if projectColumnID != column.ID {
if _, err := issues_model.CreateComment(ctx, &issues_model.CreateCommentOptions{ // add timeline to issue
Type: issues_model.CommentTypeProjectColumn, if _, err := issues_model.CreateComment(ctx, &issues_model.CreateCommentOptions{
Doer: doer, Type: issues_model.CommentTypeProjectColumn,
Repo: curIssue.Repo, Doer: doer,
Issue: curIssue, Repo: curIssue.Repo,
ProjectID: column.ProjectID, Issue: curIssue,
ProjectTitle: project.Title, ProjectID: column.ProjectID,
ProjectColumnID: column.ID, ProjectTitle: project.Title,
ProjectColumnTitle: column.Title, ProjectColumnID: column.ID,
}); err != nil { ProjectColumnTitle: column.Title,
}); err != nil {
return err
}
}
_, err = db.Exec(ctx, "UPDATE `project_issue` SET project_board_id=?, sorting=? WHERE issue_id=?", column.ID, sorting, issueID)
if err != nil {
return err return err
} }
} }