From c435dc5e6258654ab53e5ab02a892d6a9eef1722 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 01 2015 10:42:07 +0000
Subject: [PATCH 1/2] Ensure there is always a `request_comment` section on the pull-request page


It's not because there are no comments at the moment that we won't add
some and for the event-source logic to work correctly and place these
comments, there must be an `request_comment` section on the page.

---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index b161d7f..a8da47f 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -272,8 +272,9 @@
 </div>
 
 
-{% if pull_request and pull_request.comments%}
+{% if pull_request %}
 <section class="request_comment" id="request_comment">
+{% if pull_request.comments %}
 <form action="{{ url_for('.pull_request_drop_comment', username=username,
     repo=repo.name, requestid=requestid) }}" method="post">
 
@@ -285,6 +286,7 @@
 {% endfor %}
 {{ mergeform.csrf_token }}
 </form>
+{% endif %}
 </section>
 {% endif %}
 

From 7d70f2bd5e66c15174a81889e5953bdecdd7a57e Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 01 2015 10:49:37 +0000
Subject: [PATCH 2/2] Check if the PR has a discussion since that's what we iterate over


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index a8da47f..f5b30a2 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -274,7 +274,7 @@
 
 {% if pull_request %}
 <section class="request_comment" id="request_comment">
-{% if pull_request.comments %}
+{% if pull_request.discussion %}
 <form action="{{ url_for('.pull_request_drop_comment', username=username,
     repo=repo.name, requestid=requestid) }}" method="post">