Prevent double-close of issues (#6233)

zeripath · techknowlogick · commit f066bd2b3f53 · 2019-03-04T21:52:52.000-05:00
diff --git a/models/issue.go b/models/issue.go
@@ -699,8 +699,14 @@ func UpdateIssueCols(issue *Issue, cols ...string) error {
 }
 
 func (issue *Issue) changeStatus(e *xorm.Session, doer *User, isClosed bool) (err error) {
+	// Reload the issue
+	currentIssue, err := getIssueByID(e, issue.ID)
+	if err != nil {
+		return err
+	}
+
 	// Nothing should be performed if current status is same as target status
-	if issue.IsClosed == isClosed {
+	if currentIssue.IsClosed == isClosed {
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -699,8 +699,14 @@ func UpdateIssueCols(issue *Issue, cols ...string) error {`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`func (issue Issue) changeStatus(e xorm.Session, doer *User, isClosed bool) (err error) {`
	`702`	`+ // Reload the issue`
	`703`	`+ currentIssue, err := getIssueByID(e, issue.ID)`
	`704`	`+ if err != nil {`
	`705`	`+ return err`
	`706`	`+ }`
	`707`	`+`
`702`	`708`	`// Nothing should be performed if current status is same as target status`
`703`		`- if issue.IsClosed == isClosed {`
	`709`	`+ if currentIssue.IsClosed == isClosed {`
`704`	`710`	`return nil`
`705`	`711`	`}`
`706`	`712`