From fc0a9440c31adf64284ee6d8c37c35a6eb5022ce Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 04 2016 17:47:41 +0000
Subject: Add support for close_status in the API while keeping the backward compatibility


---

diff --git a/pagure/api/issue.py b/pagure/api/issue.py
index 2520af6..bdf6295 100644
--- a/pagure/api/issue.py
+++ b/pagure/api/issue.py
@@ -510,11 +510,16 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None):
     Input
     ^^^^^
 
-    +-------------+---------+--------------+------------------------------+
-    | Key         | Type    | Optionality  | Description                  |
-    +=============+=========+==============+==============================+
-    | ``status``  | string  | Mandatory    | The new status of the issue  |
-    +-------------+---------+--------------+------------------------------+
+    +----------------- +---------+--------------+------------------------+
+    | Key              | Type    | Optionality  | Description            |
+    +==================+=========+==============+========================+
+    | ``close_status`` | string  | Optional     | The close status of    |
+    |                  |         |              | the issue              |
+    +----------------- +---------+--------------+------------------------+
+    | ``status``       | string  | Mandatory    | The new status of the  |
+    |                  |         |              | issue, can be 'Open' or|
+    |                  |         |              | 'Closed'               |                 |
+    +----------------- +---------+--------------+------------------------+
 
     Sample response
     ^^^^^^^^^^^^^^^
@@ -555,15 +560,27 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None):
             403, error_code=APIERROR.EISSUENOTALLOWED)
 
     status = pagure.lib.get_issue_statuses(SESSION)
-    form = pagure.forms.StatusForm(status=status, csrf_enabled=False)
+    form = pagure.forms.StatusForm(
+        status=status,
+        close_status=repo.close_status,
+        csrf_enabled=False)
+
+    close_status = None
+    if form.close_status.raw_data:
+        close_status = form.close_status.data
+    new_status = form.status.data.strip()
+    if new_status in repo.close_status and not close_status:
+        close_status = new_status
+        form.status.data = 'Closed'
+
     if form.validate_on_submit():
-        new_status = form.status.data
         try:
             # Update status
             message = pagure.lib.edit_issue(
                 SESSION,
                 issue=issue,
                 status=new_status,
+                close_status=close_status,
                 user=flask.g.fas_user.username,
                 ticketfolder=APP.config['TICKETS_FOLDER'],
             )
diff --git a/pagure/forms.py b/pagure/forms.py
index d632905..2a63713 100644
--- a/pagure/forms.py
+++ b/pagure/forms.py
@@ -216,6 +216,11 @@ class StatusForm(FlaskForm):
         [wtforms.validators.Required()],
         choices=[]
     )
+    close_status = wtforms.SelectField(
+        'Closed as',
+        [wtforms.validators.Optional()],
+        choices=[]
+    )
 
     def __init__(self, *args, **kwargs):
         """ Calls the default constructor with the normal argument but
@@ -227,6 +232,11 @@ class StatusForm(FlaskForm):
             self.status.choices = [
                 (status, status) for status in kwargs['status']
             ]
+        self.close_status.choices = []
+        if 'close_status' in kwargs:
+            for key in sorted(kwargs['close_status']):
+                self.close_status.choices.append((key, key))
+            self.close_status.choices.insert(0, ('', ''))
 
 
 class NewTokenForm(FlaskForm):
@@ -249,6 +259,7 @@ class NewTokenForm(FlaskForm):
             ]
 
 
+
 class UpdateIssueForm(FlaskForm):
     ''' Form to add a comment to an issue. '''
     tag = wtforms.TextField(