From 7a6fffe82581191f95845acadb420b09fcff6670 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 13 2018 14:35:53 +0000
Subject: Fix keeping the branch_to value when refreshing the new remote PR page


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

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

---

diff --git a/pagure/templates/remote_pull_request.html b/pagure/templates/remote_pull_request.html
index 254b723..f9435e5 100644
--- a/pagure/templates/remote_pull_request.html
+++ b/pagure/templates/remote_pull_request.html
@@ -44,7 +44,7 @@
       {{ render_bootstrap_field(form.branch_from, size=80) }}
       To branch:
       <select id="branch_select" name="branch_to" class="c-select">
-        {% if branch_to %}<option>{{ branch_to }}</option>{% endif %}
+        {% if branch_to %}<option selected>{{ branch_to }}</option>{% endif %}
         {% for branch in g.branches |reverse %}
           {% if not branch_to or branch != branch_to %}
           <option>{{ branch }}</option>
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 353b757..68845da 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -1961,10 +1961,13 @@ def new_remote_request_pull(repo, username=None, namespace=None):
             flask.flash(str(err), "error")
 
     flask.g.branches = sorted(orig_repo.listall_branches())
-    try:
-        branch_to = orig_repo.head.shorthand
-    except pygit2.GitError:
-        branch_to = "master"
+    if flask.request.method == "GET":
+        try:
+            branch_to = orig_repo.head.shorthand
+        except pygit2.GitError:
+            branch_to = "master"
+    else:
+        branch_to = form.branch_to.data.strip()
 
     return flask.render_template(
         "remote_pull_request.html",
diff --git a/tests/test_pagure_flask_ui_remote_pr.py b/tests/test_pagure_flask_ui_remote_pr.py
index c4b9ba1..3482d98 100644
--- a/tests/test_pagure_flask_ui_remote_pr.py
+++ b/tests/test_pagure_flask_ui_remote_pr.py
@@ -281,6 +281,50 @@ class PagureRemotePRtests(tests.Modeltests):
         self.assertEqual(len(project.requests), 1)
 
     @patch('pagure.lib.notify.send_email',  MagicMock(return_value=True))
+    def test_new_remote_no_title(self):
+        """ Test creating a new remote PR authenticated when no title is
+        specified. """
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(
+            os.path.join(self.path, 'requests'), bare=True)
+        self.set_up_git_repo()
+
+        # Before
+        self.session = pagure.lib.query.create_session(self.dbpath)
+        project = pagure.lib.query.get_authorized_project(self.session, 'test')
+        self.assertEqual(len(project.requests), 0)
+
+        # Try creating a remote PR
+        user = tests.FakeUser(username='foo')
+        with tests.user_set(self.app.application, user):
+            output = self.app.get('/test/diff/remote')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                '<h2>New remote pull-request</h2>',
+                output.get_data(as_text=True))
+
+            csrf_token = self.get_csrf(output=output)
+            with patch(
+                    'pagure.forms.RemoteRequestPullForm.git_repo.args',
+                    MagicMock(return_value=(
+                        u'Git Repo address',
+                        [wtforms.validators.DataRequired()]))):
+                data = {
+                    'csrf_token': csrf_token,
+                    'branch_from': 'master',
+                    'branch_to': 'feature',
+                    'git_repo': os.path.join(self.newpath, 'test'),
+                }
+                output = self.app.post('/test/diff/remote', data=data)
+                self.assertEqual(output.status_code, 200)
+                output_text = output.get_data(as_text=True)
+                self.assertIn(
+                    '<h2>New remote pull-request</h2>', output_text)
+                self.assertIn(
+                    '<option selected>feature</option>', output_text)
+
+    @patch('pagure.lib.notify.send_email',  MagicMock(return_value=True))
     def test_new_remote_pr_empty_target(self):
         """ Test creating a new remote PR authenticated against an empty
         git repo. """