Close issue as archived/resolved/stale

models/issues/dependency_test.go

@@ -49,7 +49,8 @@ func TestCreateIssueDependency(t *testing.T) {
 	assert.False(t, left)
 
 	// Close #2 and check again
-	_, err = issues_model.ChangeIssueStatus(db.DefaultContext, issue2, user1, true)
+	issue2.IsClosed = true
+	_, err = issues_model.ChangeIssueStatus(db.DefaultContext, issue2, user1)
 	assert.NoError(t, err)
 
 	left, err = issues_model.IssueNoDependenciesLeft(db.DefaultContext, issue1)

models/issues/issue.go

@@ -91,6 +91,32 @@ func (err ErrIssueWasClosed) Error() string {
 	return fmt.Sprintf("Issue [%d] %d was already closed", err.ID, err.Index)
 }
 
+type IssueClosedStatus int8
+
+const (
+	// IssueClosedStatusCommonClose close issue without any state.
+	IssueClosedStatusCommonClose IssueClosedStatus = iota
+	// IssueClosedStatusArchived close issue as archived.
+	IssueClosedStatusArchived
+	// IssueClosedStatusResolved close issue as resolved.
+	IssueClosedStatusResolved
+	// IssueClosedStatusMerged close issue as merged.
+	IssueClosedStatusMerged
+	// IssueClosedStatusDuplicate close issue as duplicate.
+	IssueClosedStatusDuplicate
+	// IssueClosedStatusStale close issue as stale.
+	IssueClosedStatusStale
+)
+
+var issueClosedCommentTrMap = map[IssueClosedStatus]string{
+	IssueClosedStatusCommonClose: "repo.issues.closed_at",
+	IssueClosedStatusArchived:    "repo.issues.closed_as_archived_at",
+	IssueClosedStatusResolved:    "repo.issues.closed_as_resolved_at",
+	IssueClosedStatusMerged:      "repo.issues.closed_as_merged_at",
+	IssueClosedStatusDuplicate:   "repo.issues.closed_as_duplicate_at",
+	IssueClosedStatusStale:       "repo.issues.closed_as_stale_at",
+}
+
 // Issue represents an issue or pull request of repository.
 type Issue struct {
 	ID               int64                  `xorm:"pk autoincr"`
@@ -112,9 +138,10 @@ type Issue struct {
 	AssigneeID       int64            `xorm:"-"`
 	Assignee         *user_model.User `xorm:"-"`
 	IsClosed         bool             `xorm:"INDEX"`
-	IsRead           bool             `xorm:"-"`
-	IsPull           bool             `xorm:"INDEX"` // Indicates whether is a pull request or not.
-	PullRequest      *PullRequest     `xorm:"-"`
+	ClosedStatus     IssueClosedStatus
+	IsRead           bool         `xorm:"-"`
+	IsPull           bool         `xorm:"INDEX"` // Indicates whether is a pull request or not.
+	PullRequest      *PullRequest `xorm:"-"`
 	NumComments      int
 	Ref              string
 	PinOrder         int `xorm:"DEFAULT 0"`

models/issues/issue_update.go

@@ -33,26 +33,27 @@ func UpdateIssueCols(ctx context.Context, issue *Issue, cols ...string) error {
 	return nil
 }
 
-func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, isClosed, isMergePull bool) (*Comment, error) {
+func changeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, isMergePull bool) (*Comment, error) {
 	// Reload the issue
 	currentIssue, err := GetIssueByID(ctx, issue.ID)
 	if err != nil {
 		return nil, err
 	}
 
 	// Nothing should be performed if current status is same as target status
-	if currentIssue.IsClosed == isClosed {
-		if !issue.IsPull {
-			return nil, ErrIssueWasClosed{
+	if currentIssue.IsClosed == issue.IsClosed {
+		if issue.IsPull {
+			return nil, ErrPullWasClosed{
 				ID: issue.ID,
 			}
 		}
-		return nil, ErrPullWasClosed{
-			ID: issue.ID,
+		if currentIssue.ClosedStatus == issue.ClosedStatus {
+			return nil, ErrIssueIsClosed{
+				ID: issue.ID,
+			}
 		}
 	}
 
-	issue.IsClosed = isClosed
 	return doChangeIssueStatus(ctx, issue, doer, isMergePull)
 }
 
@@ -76,7 +77,7 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use
 		issue.ClosedUnix = 0
 	}
 
-	if err := UpdateIssueCols(ctx, issue, "is_closed", "closed_unix"); err != nil {
+	if err := UpdateIssueCols(ctx, issue, "is_closed", "closed_status", "closed_unix"); err != nil {
 		return nil, err
 	}
 
@@ -104,30 +105,35 @@ func doChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.Use
 
 	// New action comment
 	cmtType := CommentTypeClose
+	var content string
+	if !issue.IsPull && issue.IsClosed {
+		content = issueClosedCommentTrMap[issue.ClosedStatus]
+	}
 	if !issue.IsClosed {
 		cmtType = CommentTypeReopen
 	} else if isMergePull {
 		cmtType = CommentTypeMergePull
 	}
 
 	return CreateComment(ctx, &CreateCommentOptions{
-		Type:  cmtType,
-		Doer:  doer,
-		Repo:  issue.Repo,
-		Issue: issue,
+		Type:    cmtType,
+		Doer:    doer,
+		Repo:    issue.Repo,
+		Issue:   issue,
+		Content: content,
 	})
 }
 
 // ChangeIssueStatus changes issue status to open or closed.
-func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User, isClosed bool) (*Comment, error) {
+func ChangeIssueStatus(ctx context.Context, issue *Issue, doer *user_model.User) (*Comment, error) {
 	if err := issue.LoadRepo(ctx); err != nil {
 		return nil, err
 	}
 	if err := issue.LoadPoster(ctx); err != nil {
 		return nil, err
 	}
 
-	return changeIssueStatus(ctx, issue, doer, isClosed, false)
+	return changeIssueStatus(ctx, issue, doer, false)
 }
 
 // ChangeIssueTitle changes the title of this issue, as the given user.

models/issues/issue_xref_test.go

@@ -98,7 +98,8 @@ func TestXRef_ResolveCrossReferences(t *testing.T) {
 	i1 := testCreateIssue(t, 1, 2, "title1", "content1", false)
 	i2 := testCreateIssue(t, 1, 2, "title2", "content2", false)
 	i3 := testCreateIssue(t, 1, 2, "title3", "content3", false)
-	_, err := issues_model.ChangeIssueStatus(db.DefaultContext, i3, d, true)
+	i3.IsClosed = true
+	_, err := issues_model.ChangeIssueStatus(db.DefaultContext, i3, d)
 	assert.NoError(t, err)
 
 	pr := testCreatePR(t, 1, 2, "titlepr", fmt.Sprintf("closes #%d", i1.Index))

models/issues/pull.go

@@ -519,7 +519,8 @@ func (pr *PullRequest) SetMerged(ctx context.Context) (bool, error) {
 		return false, err
 	}
 
-	if _, err := changeIssueStatus(ctx, pr.Issue, pr.Merger, true, true); err != nil {
+	pr.Issue.IsClosed = true
+	if _, err := changeIssueStatus(ctx, pr.Issue, pr.Merger, true); err != nil {
 		return false, fmt.Errorf("Issue.changeStatus: %w", err)
 	}
 

options/locale/locale_en-US.ini

@@ -1450,6 +1450,11 @@ issues.reopen_issue = Reopen
 issues.reopen_comment_issue = Comment and Reopen
 issues.create_comment = Comment
 issues.closed_at = `closed this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_as_archived_at = `closed this issue as archived <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_as_resolved_at = `closed this issue as resolved <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_as_merged_at = `closed this issue as merged <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_as_duplicate_at = `closed this issue as duplicate <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_as_stale_at = `closed this issue as stale <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.reopened_at = `reopened this issue <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.commit_ref_at = `referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_issue_from = `<a href="%[3]s">referenced this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
@@ -1459,6 +1464,20 @@ issues.ref_reopening_from = `<a href="%[3]s">referenced a pull request %[4]s tha
 issues.ref_closed_from = `<a href="%[3]s">closed this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_reopened_from = `<a href="%[3]s">reopened this issue %[4]s</a> <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 issues.ref_from = `from %[1]s`
+issues.close_as.reopen = Reopen
+issues.close_as.common = Close Issue
+issues.close_as.archived = Close as archived
+issues.close_as.resolved = Close as resolved
+issues.close_as.merged = Close as merged
+issues.close_as.duplicate = Close as duplicate
+issues.close_as.stale = Close as stale
+issues.comment_and_close_as.reopen = Comment and Reopen
+issues.comment_and_close_as.common = Comment and Close Issue
+issues.comment_and_close_as.archived = Comment and Close as archived
+issues.comment_and_close_as.resolved = Comment and Close as resolved
+issues.comment_and_close_as.merged = Comment and Close as merged
+issues.comment_and_close_as.duplicate = Comment and Close as duplicate
+issues.comment_and_close_as.stale = Comment and Close as stale
 issues.poster = Poster
 issues.collaborator = Collaborator
 issues.owner = Owner
@@ -1737,6 +1756,7 @@ pulls.update_branch_success = Branch update was successful
 pulls.update_not_allowed = You are not allowed to update branch
 pulls.outdated_with_base_branch = This branch is out-of-date with the base branch
 pulls.close = Close Pull Request
+pulls.comment_and_close = Comment and close Pull Request
 pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.merge_instruction_hint = `You can also view <a class="show-instruction">command line instructions</a>.`

routers/api/v1/repo/issue.go

@@ -661,7 +661,8 @@ func CreateIssue(ctx *context.APIContext) {
 	}
 
 	if form.Closed {
-		if err := issue_service.ChangeStatus(issue, ctx.Doer, "", true); err != nil {
+		issue.IsClosed = form.Closed
+		if err := issue_service.ChangeStatus(issue, ctx.Doer, ""); err != nil {
 			if issues_model.IsErrDependenciesLeft(err) {
 				ctx.Error(http.StatusPreconditionFailed, "DependenciesLeft", "cannot close this issue because it still has open dependencies")
 				return