From 07cacaf73dfbbd54f4432a8edf309dc46247308f Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 1/9] Fix <br /> tag


---

diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index eddd8fb..82e63e0 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -25,7 +25,7 @@
           <span class="c-indicator"></span>
           <strong>{{ field.label }}</strong>
         </label>
-        </br>
+        <br />
         {% if field_description %}
           <small class="text-muted">{{ field_description }}</small>
         {% endif %}

From 24584d1cab6b49093527d3241a51105643f3d014 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 2/9] Let's consider the h4, h5 and h6 HTML tags safe


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index e3cbb42..d81aa9f 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -2559,7 +2559,8 @@ def clean_input(text, ignore=None):
         attrs['img'] = filter_img_src
 
     tags = bleach.ALLOWED_TAGS + [
-        'p', 'br', 'div', 'h1', 'h2', 'h3', 'table', 'td', 'tr', 'th',
+        'p', 'br', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+        'table', 'td', 'tr', 'th',
         'col', 'tbody', 'pre', 'img', 'hr', 'dl', 'dt', 'dd', 'span',
     ]
     if ignore:

From 6c8ca2c61188dc956a06648ace6113a9ac3ac66d Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 3/9] Indentation fixes


---

diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index b6c6cf3..495e75a 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -41,7 +41,10 @@
         {{ render_bootstrap_field(form.private, field_description="Do you want to keep the issue private?") }}
           <fieldset class="form-group">
             <label for="issue_content"><strong>Description</strong></label>
-            <small class="text-muted pull-xs-right"><span class="btn btn-sm btn-secondary inactive" aria-pressed="false" id="previewinmarkdown">Preview</span></small>
+            <small class="text-muted pull-xs-right">
+              <span class="btn btn-sm btn-secondary inactive"
+                aria-pressed="false" id="previewinmarkdown">Preview</span>
+            </small>
             <textarea class="form-control" rows="8" id="issue_content" name="issue_content"
                 placeholder="Describe your issue">
               {%- if issue %}{{ issue.content }}{% endif -%}
@@ -63,7 +66,6 @@
           </fieldset>
         Attach file <input id="file-picker" type="file" name="filestream" accept="image/*" multiple>
 
-
         <p class="buttons indent">
           {% if not type or type == 'new' %}
           <input type="submit" class="btn btn-primary" value="Create">
@@ -77,19 +79,19 @@
       </div>
     </div>
 
-{% if authenticated and repo_admin and type and type == 'edit' %}
-<form method="post" class="pull-xs-right" action="{{ url_for('.delete_issue',
-                    username=username, repo=repo.name, issueid=issueid) }}">
-  <button class="btn btn-danger" type="submit"
-      onclick="return confirm('Are you sure to delete this ticket? \nThis is final and cannot be un-done.');"
-      title="Delete this ticket">
-    <span class="icon icon-trash blue"></span>
-    Delete issue
-  </button>
-  {{ form.csrf_token }}
-</form>
-{% endif %}
-
+    {% if authenticated and repo_admin and type and type == 'edit' %}
+    <form method="post" class="pull-xs-right" action="{{
+        url_for('.delete_issue',
+                username=username, repo=repo.name, issueid=issueid) }}">
+      <button class="btn btn-danger" type="submit"
+          onclick="return confirm('Are you sure to delete this ticket? \nThis is final and cannot be un-done.');"
+          title="Delete this ticket">
+        <span class="icon icon-trash blue"></span>
+        Delete issue
+      </button>
+      {{ form.csrf_token }}
+    </form>
+    {% endif %}
 
   </div>
 </div>
@@ -132,42 +134,43 @@ $(document).ready(function() {
   emoji_complete(json_url, folder);
 
 });
+
 {% endif %}
 
 $(function() {
   $( "#preview" ).hide();
   $( "#previewinmarkdown" ).click(
     function(event, ui) {
-        if ($( "#previewinmarkdown" ).hasClass("inactive")){
-          var _text = $( "#issue_content" ).val();
-          var _url = "{{ url_for('markdown_preview') }}";
-            $.ajax({
-                url: _url ,
-                type: 'POST',
-                data: {
-                  content: _text,
-                  csrf_token: "{{ form.csrf_token.current_token }}",
-                },
-                dataType: 'html',
-                success: function(res) {
-                    var preview = emojione.toImage(res);
-                    $( "#preview" ).html(preview);
-                    $( "#previewinmarkdown" ).removeClass("inactive");
-                    $( "#previewinmarkdown" ).addClass("active");
-                    $( "#issue_content" ).hide();
-                    $( "#preview" ).show();
-                },
-                error: function() {
-                    alert('Unable to generate preview!'+error);
-                }
-            });
-            return false;
-          } else if ($( "#previewinmarkdown" ).hasClass("active")){
-            $( "#previewinmarkdown" ).addClass("inactive");
-            $( "#previewinmarkdown" ).removeClass("active");
-            $( "#issue_content" ).show();
-            $( "#preview" ).hide();
+      if ($( "#previewinmarkdown" ).hasClass("inactive")){
+        var _text = $( "#issue_content" ).val();
+        var _url = "{{ url_for('markdown_preview') }}";
+        $.ajax({
+          url: _url ,
+          type: 'POST',
+          data: {
+            content: _text,
+            csrf_token: "{{ form.csrf_token.current_token }}",
+          },
+          dataType: 'html',
+          success: function(res) {
+            var preview = emojione.toImage(res);
+            $( "#preview" ).html(preview);
+            $( "#previewinmarkdown" ).removeClass("inactive");
+            $( "#previewinmarkdown" ).addClass("active");
+            $( "#issue_content" ).hide();
+            $( "#preview" ).show();
+          },
+          error: function() {
+            alert('Unable to generate preview!'+error);
           }
+        });
+        return false;
+      } else if ($( "#previewinmarkdown" ).hasClass("active")){
+        $( "#previewinmarkdown" ).addClass("inactive");
+        $( "#previewinmarkdown" ).removeClass("active");
+        $( "#issue_content" ).show();
+        $( "#preview" ).hide();
+      }
     }
   );
 });

From efe62cdb86be94028cffb7f5e726eda37751e111 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 4/9] Add a new internal API endpoint to retrieve the templates of a project


This way, projects can provide a number of templates in their ticket
git repo. This API endpoint allowing to retrieve a specific one easily

---

diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py
index ac2aca5..ea1745d 100644
--- a/pagure/internal/__init__.py
+++ b/pagure/internal/__init__.py
@@ -318,3 +318,74 @@ def get_pull_request_ready_branch():
             'message': branches,
         }
     )
+
+
+@PV.route('/<repo>/issue/template', methods=['POST'])
+@PV.route('/fork/<username>/<repo>/issue/template',
+           methods=['POST'])
+def get_ticket_template(repo, username=None):
+    """ Return the template asked for the specified project
+    """
+
+    form = pagure.forms.ConfirmationForm()
+    if not form.validate_on_submit():
+        response = flask.jsonify({
+            'code': 'ERROR',
+            'message': 'Invalid input submitted',
+        })
+        response.status_code = 400
+        return response
+
+    template = flask.request.args.get('template', None)
+    if not template:
+        response = flask.jsonify({
+            'code': 'ERROR',
+            'message': 'No template provided',
+        })
+        response.status_code = 400
+        return response
+
+    repo = pagure.lib.get_project(pagure.SESSION, repo, user=username)
+
+    if repo is None:
+        response = flask.jsonify({
+            'code': 'ERROR',
+            'message': 'Project not found',
+        })
+        response.status_code = 404
+        return response
+
+    if not repo.settings.get('issue_tracker', True):
+        response = flask.jsonify({
+            'code': 'ERROR',
+            'message': 'No issue tracker found for this project',
+        })
+        response.status_code = 404
+        return response
+
+    ticketrepopath = os.path.join(
+        pagure.APP.config['TICKETS_FOLDER'], repo.path)
+    content = None
+    if os.path.exists(ticketrepopath):
+        ticketrepo = pygit2.Repository(ticketrepopath)
+        if not ticketrepo.is_empty and not ticketrepo.head_is_unborn:
+            commit = ticketrepo[ticketrepo.head.target]
+            # Get the asked template
+            content_file = pagure.__get_file_in_tree(
+                ticketrepo, commit.tree, ['templates', '%s.md' % template],
+                bail_on_tree=True)
+            if content_file:
+                content, _ = pagure.doc_utils.convert_readme(
+                        content_file.data, 'md')
+    if content:
+        response = flask.jsonify({
+            'code': 'OK',
+            'message': content,
+        })
+    else:
+        response = flask.jsonify({
+            'code': 'ERROR',
+            'message': 'No such template found',
+        })
+        response.status_code = 404
+    return response

From 4d6bb748b20187831e32f12fcf8ca3fb3b80a241 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 5/9] Add support for issue template when creating a new issue


With this change, the new_issue template will know if there are different
types of issues, what they are and what is the default template.

---

diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index b3a0211..0a0eb60 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -478,6 +478,27 @@ def new_issue(repo, username=None):
             SESSION.rollback()
             flask.flash(str(err), 'error')
 
+    types = None
+    default = None
+    ticketrepopath = os.path.join(APP.config['TICKETS_FOLDER'], repo.path)
+    if os.path.exists(ticketrepopath):
+        ticketrepo = pygit2.Repository(ticketrepopath)
+        if not ticketrepo.is_empty and not ticketrepo.head_is_unborn:
+            commit = ticketrepo[ticketrepo.head.target]
+            # Get the different ticket types
+            files = __get_file_in_tree(
+                ticketrepo, commit.tree, ['templates'],
+                bail_on_tree=True)
+            if files:
+                types = [f.name.rstrip('.md') for f in files]
+            # Get the default template
+            default_file = __get_file_in_tree(
+                ticketrepo, commit.tree, ['templates', 'default.md'],
+                bail_on_tree=True)
+            if default_file:
+                default, _ = pagure.doc_utils.convert_readme(
+                        default_file.data, 'md')
+
     return flask.render_template(
         'new_issue.html',
         select='issues',
@@ -485,6 +506,8 @@ def new_issue(repo, username=None):
         repo=repo,
         username=username,
         repo_admin=is_repo_admin(repo),
+        types=types,
+        default=default,
     )
 
 

From 324a0bdd8468de4627fb44f14788a5efc35c3640 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 6/9] If there are multiple types of ticket, show the list when creating a ticket


---

diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index 495e75a..cd37243 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -38,6 +38,19 @@
         {% if type == 'edit' %}
             {{ render_bootstrap_field(form.status, field_description="bug status") }}
         {% endif %}
+        {% if types %}
+        <fieldset class="form-group  ">
+          <strong><label for="status">Type</label></strong>
+          <select class="form-control c-select" id="type" name="type">
+            {% for type in types %}
+            <option selected value="{{ type }}">{{ type }}</option>
+            {% endfor %}
+          </select>
+          <div>
+            <small class="text-muted">Ticket type</small>
+          </div>
+        </fieldset>
+        {% endif %}
         {{ render_bootstrap_field(form.private, field_description="Do you want to keep the issue private?") }}
           <fieldset class="form-group">
             <label for="issue_content"><strong>Description</strong></label>

From d131c2255d98b261439ba4c32568327e55a23528 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 7/9] If there is a default template, show it when creating a ticket


---

diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index cd37243..e227f0b 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -60,7 +60,9 @@
             </small>
             <textarea class="form-control" rows="8" id="issue_content" name="issue_content"
                 placeholder="Describe your issue">
-              {%- if issue %}{{ issue.content }}{% endif -%}
+              {%- if issue %}{{ issue.content }}{%
+                  elif default %}{{ default }}{%
+              endif -%}
             </textarea>
             <div>
 

From 79367e04967f15f411fde05ab75f1df27c2e8a40 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 8/9] Upon changing the ticket type, offer the reload the corresponding template


---

diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index e227f0b..ca4b756 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -148,6 +148,33 @@ $(document).ready(function() {
   var json_url = '{{ url_for("static", filename="emoji/emoji_strategy.json") }}';
   emoji_complete(json_url, folder);
 
+  $("#type").on("change", function() {
+    if ( !confirm('Do you want to load the new template?')){
+      return false;
+    }
+
+    var _type = $("#type").val();
+    var _url = "{{
+      url_for('internal_ns.get_ticket_template',
+              username=repo.username if repo.is_fork else None,
+              repo=repo.name) }}";
+    _url += '?template=' + _type;
+    $.ajax({
+      url: _url ,
+      type: 'POST',
+      data: {
+        csrf_token: "{{ form.csrf_token.current_token }}",
+      },
+      dataType: 'json',
+      success: function(res) {
+        $("#issue_content").val(res.message);
+      },
+      error: function(res) {
+        alert('Unable to get this template');
+      }
+    });
+  });
+
 });
 
 {% endif %}

From f82d60bf0d4ea799538fe16875782b1d6e81afdc Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 16 2016 10:50:05 +0000
Subject: [PATCH 9/9] Add a link to the markdown syntax supported in tickets


---

diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html
index ca4b756..87ceaa8 100644
--- a/pagure/templates/new_issue.html
+++ b/pagure/templates/new_issue.html
@@ -89,6 +89,8 @@
           {% endif %}
           <input type="button" value="Cancel" class="btn btn-secondary" onclick="history.back();">
           {{ form.csrf_token }}
+          <a href="http://daringfireball.net/projects/markdown/syntax"
+            target="_blank">Markdown Syntax</a>
         </p>
       </form>
       </div>