0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 15:53:07 -05:00

track issue title changes (#841)

This commit is contained in:
Lunny Xiao 2017-02-05 22:36:00 +08:00 committed by GitHub
parent 027591a3a5
commit f35b20b042
6 changed files with 52 additions and 3 deletions

View file

@ -641,8 +641,23 @@ func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (e
func (issue *Issue) ChangeTitle(doer *User, title string) (err error) { func (issue *Issue) ChangeTitle(doer *User, title string) (err error) {
oldTitle := issue.Title oldTitle := issue.Title
issue.Title = title issue.Title = title
if err = UpdateIssueCols(issue, "name"); err != nil { sess := x.NewSession()
return fmt.Errorf("UpdateIssueCols: %v", err) defer sess.Close()
if err = sess.Begin(); err != nil {
return err
}
if err = updateIssueCols(sess, issue, "name"); err != nil {
return fmt.Errorf("updateIssueCols: %v", err)
}
if _, err = createChangeTitleComment(sess, doer, issue.Repo, issue, oldTitle, title); err != nil {
return fmt.Errorf("createChangeTitleComment: %v", err)
}
if err = sess.Commit(); err != nil {
return err
} }
if issue.IsPull { if issue.IsPull {
@ -1106,7 +1121,6 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
return issues, nil return issues, nil
} }
// UpdateIssueMentions extracts mentioned people from content and // UpdateIssueMentions extracts mentioned people from content and
// updates issue-user relations for them. // updates issue-user relations for them.
func UpdateIssueMentions(e Engine, issueID int64, mentions []string) error { func UpdateIssueMentions(e Engine, issueID int64, mentions []string) error {

View file

@ -42,6 +42,8 @@ const (
CommentTypeMilestone CommentTypeMilestone
// Assignees changed // Assignees changed
CommentTypeAssignees CommentTypeAssignees
// Change Title
CommentTypeChangeTitle
) )
// CommentTag defines comment tag type // CommentTag defines comment tag type
@ -72,6 +74,8 @@ type Comment struct {
AssigneeID int64 AssigneeID int64
Assignee *User `xorm:"-"` Assignee *User `xorm:"-"`
OldAssignee *User `xorm:"-"` OldAssignee *User `xorm:"-"`
OldTitle string
NewTitle string
CommitID int64 CommitID int64
Line int64 Line int64
@ -308,6 +312,8 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
CommitSHA: opts.CommitSHA, CommitSHA: opts.CommitSHA,
Line: opts.LineNum, Line: opts.LineNum,
Content: opts.Content, Content: opts.Content,
OldTitle: opts.OldTitle,
NewTitle: opts.NewTitle,
} }
if _, err = e.Insert(comment); err != nil { if _, err = e.Insert(comment); err != nil {
return nil, err return nil, err
@ -455,6 +461,17 @@ func createAssigneeComment(e *xorm.Session, doer *User, repo *Repository, issue
}) })
} }
func createChangeTitleComment(e *xorm.Session, doer *User, repo *Repository, issue *Issue, oldTitle, newTitle string) (*Comment, error) {
return createComment(e, &CreateCommentOptions{
Type: CommentTypeChangeTitle,
Doer: doer,
Repo: repo,
Issue: issue,
OldTitle: oldTitle,
NewTitle: newTitle,
})
}
// CreateCommentOptions defines options for creating comment // CreateCommentOptions defines options for creating comment
type CreateCommentOptions struct { type CreateCommentOptions struct {
Type CommentType Type CommentType
@ -467,6 +484,8 @@ type CreateCommentOptions struct {
MilestoneID int64 MilestoneID int64
OldAssigneeID int64 OldAssigneeID int64
AssigneeID int64 AssigneeID int64
OldTitle string
NewTitle string
CommitID int64 CommitID int64
CommitSHA string CommitSHA string
LineNum int64 LineNum int64

View file

@ -549,6 +549,7 @@ issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`
issues.self_assign_at = `self-assigned this %s` issues.self_assign_at = `self-assigned this %s`
issues.add_assignee_at = `was assigned by <b>%s</b> %s` issues.add_assignee_at = `was assigned by <b>%s</b> %s`
issues.remove_assignee_at = `removed their assignment %s` issues.remove_assignee_at = `removed their assignment %s`
issues.change_title_at = `changed title from <b>%s</b> to <b>%s</b> %s`
issues.open_tab = %d Open issues.open_tab = %d Open
issues.close_tab = %d Closed issues.close_tab = %d Closed
issues.filter_label = Label issues.filter_label = Label

View file

@ -506,6 +506,10 @@ issues.remove_label_at = ` %[4]s 删除了标签 <div class="ui label" style="co
issues.add_milestone_at = ` %[2]s 添加了里程碑 <b>%[1]s</b>` issues.add_milestone_at = ` %[2]s 添加了里程碑 <b>%[1]s</b>`
issues.change_milestone_at = `%[3]s 修改了里程碑从 <b>%[1]s</b> 到 <b>%[2]s</b>` issues.change_milestone_at = `%[3]s 修改了里程碑从 <b>%[1]s</b> 到 <b>%[2]s</b>`
issues.remove_milestone_at = `%[2]s 删除了里程碑 <b>%[1]s</b>` issues.remove_milestone_at = `%[2]s 删除了里程碑 <b>%[1]s</b>`
issues.self_assign_at = `于 %s 指派给自己`
issues.add_assignee_at = `于 %[2]s 被 <b>%[1]s</b> 指派`
issues.remove_assignee_at = `于 %s 取消了指派`
issues.change_title_at = `于 %[3]s 修改标题 <b>%[1]s</b> 为 <b>%[2]s</b>`
issues.open_tab=%d 个开启中 issues.open_tab=%d 个开启中
issues.close_tab=%d 个已关闭 issues.close_tab=%d 个已关闭
issues.filter_label=标签筛选 issues.filter_label=标签筛选

View file

@ -444,6 +444,7 @@ function initRepository() {
function (data) { function (data) {
$editInput.val(data.title); $editInput.val(data.title);
$issueTitle.text(data.title); $issueTitle.text(data.title);
location.reload();
}); });
return false; return false;
}); });

View file

@ -175,6 +175,16 @@
<img src="{{.Poster.RelAvatarLink}}"> <img src="{{.Poster.RelAvatarLink}}">
</a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} </span>{{end}} </a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} </span>{{end}}
</div> </div>
{{else if eq .Type 10}}
<div class="event">
<span class="octicon octicon-primitive-dot"></span>
</div>
<a class="ui avatar image" href="{{.Poster.HomeLink}}">
<img src="{{.Poster.RelAvatarLink}}">
</a>
<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a>
{{$.i18n.Tr "repo.issues.change_title_at" .OldTitle .NewTitle $createdStr | Safe}}
</span>
{{end}} {{end}}
{{end}} {{end}}