From cbd16782b78cf58e01ee8818e26a994a338b8097 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 05 2015 14:56:31 +0000
Subject: [PATCH 1/4] Fix who is allowed to drop comments


You are now allowed to drop a comment if:
- You did not make the comment
or
- The PR/Issue is Closed
and
- You are not a project admin

---

diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index cb81346..57de775 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -353,8 +353,8 @@ def pull_request_drop_comment(repo, requestid, username=None):
                 flask.abort(404, 'Comment not found')
 
             if (flask.g.fas_user.username != comment.user.username
-                    and comment.parent.status is True) \
-                    or not is_repo_admin(repo):
+                    or comment.parent.status is False) \
+                    and not is_repo_admin(repo):
                 flask.abort(
                     403,
                     'You are not allowed to remove this comment from '
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 8184343..bd80924 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -77,8 +77,8 @@ def update_issue(repo, issueid, username=None):
                 flask.abort(404, 'Comment not found')
 
             if (flask.g.fas_user.username != comment.user.username
-                    and comment.parent.status is True) \
-                    or not is_repo_admin(repo):
+                    or comment.parent.status != 'Open') \
+                    and not is_repo_admin(repo):
                 flask.abort(
                     403,
                     'You are not allowed to remove this comment from '

From 34464ab11a9c060a8cd7582431f3c63c6e737f8b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 05 2015 14:57:55 +0000
Subject: [PATCH 2/4] Fix showing the drop comment button on comments


The status must be 'Open' for issues and True for pull-requests

---

diff --git a/pagure/templates/_formhelper.html b/pagure/templates/_formhelper.html
index d05ce61..d9c46f7 100644
--- a/pagure/templates/_formhelper.html
+++ b/pagure/templates/_formhelper.html
@@ -76,7 +76,7 @@
           reply
         </a>
         {% if id != 0 and g.fas_user and (
-            (comment.parent.status == True and g.fas_user.username == comment.user.username)
+            (comment.parent.status in [True, 'Open'] and g.fas_user.username == comment.user.username)
             or repo_admin) %}
         <button type="submit" name="drop_comment" value="{{ comment.id }}"
             onclick="return confirm('Do you really want to remove this comment?');"

From b8c39012d861e3857aee6622adde4906d73fe2a6 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 05 2015 15:21:32 +0000
Subject: [PATCH 3/4] Drop the commitid from the link, it's no longer used


---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 7c68cee..8033681 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -328,7 +328,7 @@
     function() {
       var sel = $('#branch_select');
       var final_url = "{{ url_for('.new_request_pull', username=username,
-        repo=repo.name, commitid=commitid, branch_from=branch_from,
+        repo=repo.name, branch_from=branch_from,
         branch_to='--') }}";
       final_url = final_url.replace('--', sel.val());
       window.location.href = final_url;

From ad2d7dc680a7f5b9e89f0f193e90c254677aecc4 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 05 2015 15:21:44 +0000
Subject: [PATCH 4/4] Fix creating the pull-request for fast people like @lmacken


This should allow create the pull-request against the correct branch
even if the user did not let the page refresh completely

---

diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 57de775..f423a1e 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -605,6 +605,7 @@ def new_request_pull(repo, branch_to, branch_from, username=None):
     """ Request pulling the changes from the fork into the project.
     """
     repo = pagure.lib.get_project(SESSION, repo, user=username)
+    branch_to = flask.request.values.get('branch_to', branch_to)
 
     if not repo:
         flask.abort(404)