From 3e0525b47d2d84a251341950cb08da36f42663dd Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 3 Feb 2017 23:09:10 +0800 Subject: [PATCH] Track assignee for issue (#808) * track assignee for issue * fix lint * use getUserByID instead Get --- models/issue.go | 21 +++++++++ models/issue_comment.go | 63 +++++++++++++++++++++----- options/locale/locale_en-US.ini | 3 ++ routers/repo/issue.go | 5 ++ templates/repo/issue/view_content.tmpl | 13 ++++++ 5 files changed, 94 insertions(+), 11 deletions(-) diff --git a/models/issue.go b/models/issue.go index 4b80c41325..7d7591837e 100644 --- a/models/issue.go +++ b/models/issue.go @@ -703,11 +703,23 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { // ChangeAssignee changes the Asssignee field of this issue. func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) { + var oldAssigneeID = issue.AssigneeID issue.AssigneeID = assigneeID if err = UpdateIssueUserByAssignee(issue); err != nil { return fmt.Errorf("UpdateIssueUserByAssignee: %v", err) } + sess := x.NewSession() + defer sess.Close() + + if err = issue.loadRepo(sess); err != nil { + return fmt.Errorf("loadRepo: %v", err) + } + + if _, err = createAssigneeComment(sess, doer, issue.Repo, issue, oldAssigneeID, assigneeID); err != nil { + return fmt.Errorf("createAssigneeComment: %v", err) + } + issue.Assignee, err = GetUserByID(issue.AssigneeID) if err != nil && !IsErrUserNotExist(err) { log.Error(4, "GetUserByID [assignee_id: %v]: %v", issue.AssigneeID, err) @@ -798,6 +810,15 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { } } + if opts.Issue.AssigneeID > 0 { + if err = opts.Issue.loadRepo(e); err != nil { + return err + } + if _, err = createAssigneeComment(e, doer, opts.Issue.Repo, opts.Issue, -1, opts.Issue.AssigneeID); err != nil { + return err + } + } + if opts.IsPull { _, err = e.Exec("UPDATE `repository` SET num_pulls = num_pulls + 1 WHERE id = ?", opts.Issue.RepoID) } else { diff --git a/models/issue_comment.go b/models/issue_comment.go index d128e2ebab..9e5e87e3c9 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -40,6 +40,8 @@ const ( CommentTypeLabel // Milestone changed CommentTypeMilestone + // Assignees changed + CommentTypeAssignees ) // CommentTag defines comment tag type @@ -55,17 +57,22 @@ const ( // Comment represents a comment in commit and issue page. type Comment struct { - ID int64 `xorm:"pk autoincr"` - Type CommentType - PosterID int64 `xorm:"INDEX"` - Poster *User `xorm:"-"` - IssueID int64 `xorm:"INDEX"` - LabelID int64 - Label *Label `xorm:"-"` - OldMilestoneID int64 - MilestoneID int64 - OldMilestone *Milestone `xorm:"-"` - Milestone *Milestone `xorm:"-"` + ID int64 `xorm:"pk autoincr"` + Type CommentType + PosterID int64 `xorm:"INDEX"` + Poster *User `xorm:"-"` + IssueID int64 `xorm:"INDEX"` + LabelID int64 + Label *Label `xorm:"-"` + OldMilestoneID int64 + MilestoneID int64 + OldMilestone *Milestone `xorm:"-"` + Milestone *Milestone `xorm:"-"` + OldAssigneeID int64 + AssigneeID int64 + Assignee *User `xorm:"-"` + OldAssignee *User `xorm:"-"` + CommitID int64 Line int64 Content string `xorm:"TEXT"` @@ -240,6 +247,25 @@ func (c *Comment) LoadMilestone() error { return nil } +// LoadAssignees if comment.Type is CommentTypeAssignees, then load assignees +func (c *Comment) LoadAssignees() error { + var err error + if c.OldAssigneeID > 0 { + c.OldAssignee, err = getUserByID(x, c.OldAssigneeID) + if err != nil { + return err + } + } + + if c.AssigneeID > 0 { + c.Assignee, err = getUserByID(x, c.AssigneeID) + if err != nil { + return err + } + } + return nil +} + // MailParticipants sends new comment emails to repository watchers // and mentioned people. func (c *Comment) MailParticipants(e Engine, opType ActionType, issue *Issue) (err error) { @@ -276,6 +302,8 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err LabelID: LabelID, OldMilestoneID: opts.OldMilestoneID, MilestoneID: opts.MilestoneID, + OldAssigneeID: opts.OldAssigneeID, + AssigneeID: opts.AssigneeID, CommitID: opts.CommitID, CommitSHA: opts.CommitSHA, Line: opts.LineNum, @@ -416,6 +444,17 @@ func createMilestoneComment(e *xorm.Session, doer *User, repo *Repository, issue }) } +func createAssigneeComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, oldAssigneeID, assigneeID int64) (*Comment, error) { + return createComment(e, &CreateCommentOptions{ + Type: CommentTypeAssignees, + Doer: doer, + Repo: repo, + Issue: issue, + OldAssigneeID: oldAssigneeID, + AssigneeID: assigneeID, + }) +} + // CreateCommentOptions defines options for creating comment type CreateCommentOptions struct { Type CommentType @@ -426,6 +465,8 @@ type CreateCommentOptions struct { OldMilestoneID int64 MilestoneID int64 + OldAssigneeID int64 + AssigneeID int64 CommitID int64 CommitSHA string LineNum int64 diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index cd2b67f8da..0859709db1 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -546,6 +546,9 @@ issues.remove_label_at = `removed the
{{.Poster.Name}} {{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.change_milestone_at" .OldMilestone.Name .Milestone.Name $createdStr | Safe}}{{else}}{{$.i18n.Tr "repo.issues.remove_milestone_at" .OldMilestone.Name $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{$.i18n.Tr "repo.issues.add_milestone_at" .Milestone.Name $createdStr | Safe}}{{end}}
+ {{else if eq .Type 9}} +
+ + {{if gt .AssigneeID 0}}{{if eq .Poster.ID .AssigneeID}} + + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}} + {{else}} + + {{.Assignee.Name}} {{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}} {{end}}{{else if gt .OldAssigneeID 0}} + + + {{.Poster.Name}} {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} {{end}} +
{{end}} {{end}}