From c5ff01daacc7d86fdd0c255a974d5d10f5227627 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Sep 03 2019 12:17:45 +0000
Subject: Tweak when we show the merge and the rebase buttons


Only show the merge button when the user is a committer of the project
against which the PR is opened.
Show the rebase button when the user is allowed to rebase the PR or has
commit to the project the PR originates from.

Fixes https://pagure.io/pagure/issue/4596

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

---

diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html
index ae6a174..e012de2 100644
--- a/pagure/templates/repo_pull_request.html
+++ b/pagure/templates/repo_pull_request.html
@@ -182,24 +182,26 @@
           </a>
           <div id="merge-alert" class="text-xs-center dropdown-menu dropdown-menu-right p-0">
              <div class="alert text-center mb-0">
-                {% if pull_request.status == 'Open' and g.repo_committer %}
-                <small id="merge-alert-message"></small>
-                <form action="{{ url_for('ui_ns.merge_request_pull',
-                        repo=repo.name,
-                        username=repo.user.user if repo.is_fork else None,
-                        namespace=repo.namespace,
-                        requestid=requestid)
-                  }}" method="POST"  id="merge_pr_form">
-                  {{ mergeform.csrf_token }}
-                  <button id="merge_btn" type="submit"
-                    class="btn btn-block my-2">Merge</button>
-                  {% if can_delete_branch %}
-                  <div class="small">
-                  {{ mergeform.delete_branch }} {{ mergeform.delete_branch.label }}
-                  </div>
-                  {% endif %}
-                </form>
-                {% if pull_request.allow_rebase %}
+              {% if pull_request.status == 'Open' %}
+                {% if g.repo_committer %}
+                  <small id="merge-alert-message"></small>
+                  <form action="{{ url_for('ui_ns.merge_request_pull',
+                          repo=repo.name,
+                          username=repo.user.user if repo.is_fork else None,
+                          namespace=repo.namespace,
+                          requestid=requestid)
+                    }}" method="POST"  id="merge_pr_form">
+                    {{ mergeform.csrf_token }}
+                    <button id="merge_btn" type="submit"
+                      class="btn btn-block my-2">Merge</button>
+                    {% if can_delete_branch %}
+                    <div class="small">
+                    {{ mergeform.delete_branch }} {{ mergeform.delete_branch.label }}
+                    </div>
+                    {% endif %}
+                  </form>
+                {% endif %}
+                {% if pull_request.allow_rebase or can_delete_branch %}
                 <button id="rebase_btn" type="submit"
                   class="btn btn-block my-2">Rebase</button>
                 {% endif %}