From bd4cd5ebf98da20163a312f7e84b5a0e7a4eb188 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 08 2018 10:00:41 +0000
Subject: When creating a new PR, allow updating the branch from


In the same way we currently allow updating the branch targeted by the
pull-request, this allows updating the branch from which the changes are
pulled.

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

---

diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index c01e751..e091d60 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -176,7 +176,14 @@
       </span>
       <span class="pr-toplabel">
         <span class="oi" data-glyph="random"></span>
-        {{ branch_from }}
+        <select class="pr-toplabel-select" id="branch_from_select" name="branch_from">
+          <option value="{{ branch_from }}">{{ branch_from }}</option>
+        {% for br in parent_branches |reverse %}
+          {% if br != branch_from %}
+          <option value="{{ br }}">{{ br }}</option>
+          {% endif %}
+        {% endfor %}
+      </select>
       </span>
       into
       <span class="pr-toplabel">
@@ -221,7 +228,8 @@
       </div>
     </fieldset>
     <p class="buttons indent">
-      <input type="submit" class="btn btn-primary" value="Create">
+      <input type="submit" class="btn btn-primary" value="Create" {%
+          if not diff %} disabled title="There appear to be no diff, so nothing to request pulling"{% endif %}>
       {{ form.csrf_token }}
       <a class="btn btn-secondary" href="{{ url_for(
         'ui_ns.view_repo',
@@ -1097,6 +1105,24 @@ $(document).ready(function() {
     }
   });
 
+  var branchselect = $('#branch_from_select').selectize({
+    create: false,
+    sortField: 'text',
+    allowEmptyOption: false,
+    onChange:     function(value) {
+      if (value != ""){
+        var sel = $('#branch_from_select');
+        var final_url = "{{ url_for('ui_ns.new_request_pull', username=username,
+          namespace=repo.namespace, repo=repo.name,
+          branch_from='--', branch_to=branch_to) }}";
+        final_url = final_url.replace('--', sel.val());
+        console.log(final_url);
+        //return false;
+        window.location.href = final_url;
+      }
+    }
+  });
+
 {% if pull_request %}
 {# These lines are only for existing pull-requests, not new ones #}
 
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 54beaa0..9ce5734 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -1217,6 +1217,7 @@ def new_request_pull(
         repo=repo,
         username=username,
         orig_repo=orig_repo,
+        parent_branches=sorted(orig_repo.listall_branches()),
         diff_commits=diff_commits,
         diff=diff,
         form=form,