From 9ee3a079b7bfa53e1c68e5510643de538db8a223 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 31 2017 09:41:48 +0000
Subject: Allow project maintainer to set metadata when creating a new issue


This commit allows project maintainer to set some of the metadata when
creating a new issue. This currently supports: tags, assignee, priority
and milestone.

Fixes #926

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/forms.py b/pagure/forms.py
index a07b8f3..6e8080d 100644
--- a/pagure/forms.py
+++ b/pagure/forms.py
@@ -198,11 +198,39 @@ class IssueFormSimplied(PagureForm):
         [wtforms.validators.optional()],
         false_values=FALSE_VALUES,
     )
-    milestone = wtforms.TextField(
+    milestone = wtforms.SelectField(
         'Milestone',
         [wtforms.validators.Optional()],
+        choices=[],
+        coerce=convert_value
+    )
+    priority = wtforms.SelectField(
+        'Priority',
+        [wtforms.validators.Optional()],
+        choices=[],
+        coerce=convert_value
     )
 
+    def __init__(self, *args, **kwargs):
+        """ Calls the default constructor with the normal argument but
+        uses the list of collection provided to fill the choices of the
+        drop-down list.
+        """
+        super(IssueFormSimplied, self).__init__(*args, **kwargs)
+
+        self.priority.choices = []
+        if 'priorities' in kwargs:
+            for key in sorted(kwargs['priorities']):
+                self.priority.choices.append(
+                    (key, kwargs['priorities'][key])
+                )
+
+        self.milestone.choices = []
+        if 'milestones' in kwargs and kwargs['milestones']:
+            for key in sorted(kwargs['milestones']):
+                self.milestone.choices.append((key, key))
+        self.milestone.choices.insert(0, ('', ''))
+
 
 class IssueForm(IssueFormSimplied):
     ''' Form to create or edit an issue. '''
diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 8e88c2f..16e6c42 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -1417,7 +1417,8 @@ def new_project(session, user, name, blacklist, allowed_prefix,
 
 def new_issue(session, repo, title, content, user, ticketfolder, issue_id=None,
               issue_uid=None, private=False, status=None, close_status=None,
-              notify=True, date_created=None, milestone=None, priority=None):
+              notify=True, date_created=None, milestone=None, priority=None,
+              assignee=None, tags=None):
     ''' Create a new issue for the specified repo. '''
     user_obj = get_user(session, user)
 
@@ -1434,6 +1435,10 @@ def new_issue(session, repo, title, content, user, ticketfolder, issue_id=None,
             'You are trying to create an issue with a priority that does '
             'not exist in the project.')
 
+    assignee_id = None
+    if assignee is not None:
+        assignee_id = get_user(session, assignee).id
+
     issue = model.Issue(
         id=issue_id or get_next_id(session, repo.id),
         project_id=repo.id,
@@ -1441,6 +1446,7 @@ def new_issue(session, repo, title, content, user, ticketfolder, issue_id=None,
         content=content,
         priority=priority,
         milestone=milestone,
+        assignee_id=assignee_id,
         user_id=user_obj.id,
         uid=issue_uid or uuid.uuid4().hex,
         private=private,
@@ -1456,6 +1462,25 @@ def new_issue(session, repo, title, content, user, ticketfolder, issue_id=None,
     session.add(issue)
     # Make sure we won't have SQLAlchemy error before we create the issue
     session.flush()
+
+    # Add the tags if any are specified
+    if tags is not None:
+        for lbl in tags:
+            tagobj = get_colored_tag(session, lbl, repo.id)
+            if not tagobj:
+                tagobj = model.TagColored(
+                    tag=lbl,
+                    project_id=repo.id
+                )
+                session.add(tagobj)
+                session.flush()
+
+            dbobjtag = model.TagIssueColored(
+                issue_uid=issue.uid,
+                tag_id=tagobj.id
+            )
+            session.add(dbobjtag)
+
     session.commit()
 
     pagure.lib.git.update_git(
diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index a678f76..ac6e428 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -12,12 +12,29 @@
   rel="stylesheet" />
 <link href="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.css') }}"
   rel="stylesheet" />
+<link href="{{ url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}"
+  rel="stylesheet" />
 {% endblock %}
 
 
 {% block repo %}
 <div class="row">
-  <div class="col-md-8 col-md-offset-2">
+  {% if not type or type == 'new' %}
+  <form action="{{ url_for('.new_issue',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace)
+    }}" method="post" enctype="multipart/form-data">
+
+  {% elif type and type == 'edit' %}
+  <form action="{{ url_for('.edit_issue',
+        repo=repo.name,
+        username=username,
+        namespace=repo.namespace,
+        issueid=issueid) }}" method="post"
+        enctype="multipart/form-data">
+  {% endif %}
+  <div class="col-md-8">
     <div class="card">
       <div class="card-header">
         {% if not type or type == 'new' %}
@@ -27,21 +44,6 @@
         {% endif %}
       </div>
       <div class="card-block">
-        {% if not type or type == 'new' %}
-          <form action="{{ url_for('.new_issue',
-                repo=repo.name,
-                username=username,
-                namespace=repo.namespace)
-            }}" method="post" enctype="multipart/form-data">
-
-        {% elif type and type == 'edit' %}
-          <form action="{{ url_for('.edit_issue',
-                repo=repo.name,
-                username=username,
-                namespace=repo.namespace,
-                issueid=issueid) }}" method="post"
-                enctype="multipart/form-data">
-        {% endif %}
         {{ render_bootstrap_field(form.title, field_description="Gist of your issue") }}
         {% if type == 'edit' %}
             {{ render_bootstrap_field(form.status, field_description="bug status") }}
@@ -102,9 +104,38 @@
           <a href="https://docs.pagure.org/pagure/usage/markdown.html"
             target="_blank" rel="noopener noreferrer">Markdown Syntax</a>
         </p>
-      </form>
       </div>
     </div>
+  </div>
+
+  {% if g.repo_user and not type or type == 'new' %}
+  <div class="col-md-4">
+    <div class="card">
+      <div class="card-block">
+
+        <fieldset class="form-group">
+          <label for="tag"><strong>Tags</strong></label>
+           <input id="tag" class="form-control" type="text"
+              placeholder="tag1, tag2" name="tag"
+              title="comma separated list of tags"
+              value="{{ request.form.tags or '' }}" />
+        </fieldset>
+
+        <fieldset class="form-group">
+          <label for="assignee"><strong>Assignee</strong></label>
+          <input class="form-control" name="assignee" id="assignee"
+            placeholder="username"
+            value="{{ request.form.assignee or '' }}" />
+        </fieldset>
+
+        {{ render_bootstrap_field(form.priority) }}
+        {{ render_bootstrap_field(form.milestone) }}
+
+      </div>
+    </div>
+  </div>
+  {% endif %}
+  </form>
 
     {% if authenticated and g.repo_committer and type and type == 'edit' %}
     <form method="post" class="pull-xs-right" action="{{
@@ -123,7 +154,6 @@
     </form>
     {% endif %}
 
-  </div>
 </div>
 
 {% endblock %}
@@ -145,6 +175,9 @@
 <script type="text/javascript"
     src="{{ url_for('static', filename='vendor/jquery.atwho/jquery.atwho.min.js') }}">
 </script>
+<script type="text/javascript"
+    src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}">
+</script>
 
 <script type="text/javascript">
 {% if authenticated and form %}
@@ -214,6 +247,25 @@ $(document).ready(function() {
     });
   });
 
+  {% if g.repo_user %}
+  var available_tags = [];
+  {% for tog in tag_list %}
+    available_tags.push("{{ tog.tag }}");
+  {% endfor %}
+  var items = available_tags.map(function(x) { return { item: x }; });
+
+  $('#tag').selectize({
+    delimiter: ',',
+    options: items,
+    persist: false,
+    create: false,
+    labelField: "item",
+    valueField: "item",
+    searchField: ["item"],
+  });
+
+  {% endif %}
+
 });
 
 {% endif %}
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 9465906..e6f7e25 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -878,7 +878,11 @@ def new_issue(repo, username=None, namespace=None):
     """
     repo = flask.g.repo
 
-    form = pagure.forms.IssueFormSimplied()
+    form = pagure.forms.IssueFormSimplied(
+        priorities=repo.priorities,
+        milestones=repo.milestones,
+    )
+
     if form.validate_on_submit():
         title = form.title.data
         content = form.issue_content.data
@@ -900,6 +904,20 @@ def new_issue(repo, username=None, namespace=None):
                     if repo.default_priority == val:
                         priority = key
 
+            assignee = None
+            milestone = None
+            tags = None
+            if flask.g.repo_user:
+                assignee = flask.request.form.get(
+                    'assignee', '').strip() or None
+                milestone = form.milestone.data or None
+                priority = form.priority.data or priority
+                tags = [
+                    tag.strip()
+                    for tag in flask.request.form.get(
+                        'tag', '').split(',')
+                    if tag.strip()]
+
             issue = pagure.lib.new_issue(
                 SESSION,
                 repo=repo,
@@ -907,7 +925,10 @@ def new_issue(repo, username=None, namespace=None):
                 content=content,
                 private=private or False,
                 user=flask.g.fas_user.username,
+                assignee=assignee,
+                milestone=milestone,
                 priority=priority,
+                tags=tags,
                 ticketfolder=APP.config['TICKETS_FOLDER'],
             )
             SESSION.commit()
@@ -974,11 +995,19 @@ def new_issue(repo, username=None, namespace=None):
                 default, _ = pagure.doc_utils.convert_readme(
                     default_file.data, 'md')
 
+    tag_list = pagure.lib.get_tags_of_project(SESSION, repo)
     if flask.request.method == 'GET':
         form.private.data = repo.settings.get(
             'issues_default_to_private', False)
         form.title.data = flask.request.args.get('title')
         form.issue_content.data = flask.request.args.get('content')
+        default_priority = None
+        if repo.default_priority:
+                for key, val in repo.priorities.items():
+                    if repo.default_priority == val:
+                        default_priority = key
+        form.priority.data = flask.request.form.get(
+            'priority', str(default_priority))
 
     return flask.render_template(
         'new_issue.html',
@@ -988,6 +1017,7 @@ def new_issue(repo, username=None, namespace=None):
         username=username,
         types=types,
         default=default,
+        tag_list=tag_list,
     )
 
 
diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index fe31702..f812be6 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -421,6 +421,193 @@ class PagureFlaskIssuestests(tests.Modeltests):
                 'bfccaca609c8b4480523e',
                 output.data)
 
+    def test_new_issue_metadata_user(self):
+        """ Test the new_issue endpoint when the user has access to the
+        project. """
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(
+            os.path.join(self.path, 'repos'), bare=True)
+        tests.create_projects_git(
+            os.path.join(self.path, 'tickets'), bare=True)
+
+        user = tests.FakeUser()
+        user.username = 'pingou'
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/test/new_issue')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<div class="card-header">\n        New issue',
+                output.data)
+            self.assertIn(
+                '<label for="tag"><strong>Tags</strong></label>',
+                output.data)
+            self.assertIn(
+                '<label for="assignee"><strong>Assignee</strong></label>',
+                output.data)
+
+    def test_new_issue_metadata_not_user(self):
+        """ Test the new_issue endpoint when the user does not have access
+        to the project. """
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(
+            os.path.join(self.path, 'repos'), bare=True)
+        tests.create_projects_git(
+            os.path.join(self.path, 'tickets'), bare=True)
+
+        user = tests.FakeUser()
+        user.username = 'foo'
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/test/new_issue')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<div class="card-header">\n        New issue',
+                output.data)
+            self.assertNotIn(
+                '<label for="tag"><strong>Tags</strong></label>',
+                output.data)
+            self.assertNotIn(
+                '<label for="assignee"><strong>Assignee</strong></label>',
+                output.data)
+
+    @patch('pagure.lib.git.update_git', MagicMock(return_value=True))
+    @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
+    def test_new_issue_with_metadata(self):
+        """ Test the new_issue endpoint when the user has access to the
+        project. """
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(
+            os.path.join(self.path, 'repos'), bare=True)
+        tests.create_projects_git(
+            os.path.join(self.path, 'tickets'), bare=True)
+
+        # Set some milestone
+        repo = pagure.get_authorized_project(self.session, 'test')
+        repo.milestones = {'v1.0': '', 'v2.0': 'Tomorrow!'}
+        self.session.add(repo)
+        self.session.commit()
+
+        user = tests.FakeUser()
+        user.username = 'pingou'
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/test/new_issue')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<div class="card-header">\n        New issue',
+                output.data)
+            self.assertIn(
+                '<label for="tag"><strong>Tags</strong></label>',
+                output.data)
+            self.assertIn(
+                '<label for="assignee"><strong>Assignee</strong></label>',
+                output.data)
+
+            csrf_token = self.get_csrf(output=output)
+
+            data = {
+                    'title': 'Test issue3',
+                    'issue_content': 'We really should improve on this issue\n',
+                    'status': 'Open',
+                    'assignee': 'foo',
+                    'milestone': 'v2.0',
+                    'tag': 'tag2',
+                    'csrf_token': csrf_token,
+                }
+
+            output = self.app.post(
+                '/test/new_issue', data=data, follow_redirects=True)
+
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<title>Issue #1: Test issue3 - test - Pagure</title>',
+                output.data)
+            self.assertIn(
+                '<a class="btn btn-primary btn-sm" '
+                'href="/test/issue/1/edit" '
+                'title="Edit this issue">',
+                output.data)
+            # Check the metadata
+            self.assertIn(
+                'title="comma separated list of tags"\n                '
+                'value="tag2" />', output.data)
+            self.assertIn(
+                'placeholder="username"\n              value="foo" />',
+                output.data)
+            self.assertIn(
+                '<div id="milestone_plain">\n              <span >v2.0</span>',
+                output.data)
+
+    @patch('pagure.lib.git.update_git', MagicMock(return_value=True))
+    @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
+    def test_new_issue_with_metadata_not_user(self):
+        """ Test the new_issue endpoint when the user does not have access
+        to the project but still tries to.
+        """
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(
+            os.path.join(self.path, 'repos'), bare=True)
+        tests.create_projects_git(
+            os.path.join(self.path, 'tickets'), bare=True)
+
+        # Set some milestone
+        repo = pagure.get_authorized_project(self.session, 'test')
+        repo.milestones = {'v1.0': '', 'v2.0': 'Tomorrow!'}
+        self.session.add(repo)
+        self.session.commit()
+
+        user = tests.FakeUser()
+        user.username = 'foo'
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/test/new_issue')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<div class="card-header">\n        New issue',
+                output.data)
+            self.assertNotIn(
+                '<label for="tag"><strong>Tags</strong></label>',
+                output.data)
+            self.assertNotIn(
+                '<label for="assignee"><strong>Assignee</strong></label>',
+                output.data)
+
+            csrf_token = self.get_csrf(output=output)
+
+            data = {
+                    'title': 'Test issue3',
+                    'issue_content': 'We really should improve on this issue\n',
+                    'status': 'Open',
+                    'assignee': 'foo',
+                    'milestone': 'v2.0',
+                    'tag': 'tag2',
+                    'csrf_token': csrf_token,
+                }
+
+            output = self.app.post(
+                '/test/new_issue', data=data, follow_redirects=True)
+
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<title>Issue #1: Test issue3 - test - Pagure</title>',
+                output.data)
+            self.assertIn(
+                '<a class="btn btn-primary btn-sm" '
+                'href="/test/issue/1/edit" '
+                'title="Edit this issue">',
+                output.data)
+            # Check the metadata
+            self.assertNotIn(
+                'title="comma separated list of tags"\n                '
+                'value="tag2" />', output.data)
+            self.assertNotIn(
+                'placeholder="username"\n              value="foo" />',
+                output.data)
+            self.assertNotIn(
+                '<div id="milestone_plain">\n              <span >v2.0</span>',
+                output.data)
+
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
     def test_view_issues(self, p_send_email, p_ugt):