From 0428eddd3a4746b7eb642bdb155dfd2fb8e204bf Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: May 06 2018 18:09:46 +0000 Subject: Do not redirect if we can't show a diff on a PR, just show no diff This is needed in order to, for example, close PRs whose targeted branch has been deleted. Fixes https://pagure.io/fedora-infrastructure/issue/6865 Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index bb4ee39..df4cd57 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -221,9 +221,6 @@ def request_pull(repo, requestid, username=None, namespace=None): requestfolder=pagure_config['REQUESTS_FOLDER']) except pagure.exceptions.PagureException as err: flask.flash('%s' % err, 'error') - return flask.redirect(flask.url_for( - 'ui_ns.view_repo', username=username, repo=repo.name, - namespace=namespace)) except SQLAlchemyError as err: # pragma: no cover flask.g.session.rollback() _log.exception(err) diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 2f06067..842470e 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -827,7 +827,7 @@ class PagureFlaskForktests(tests.Modeltests): self.assertEqual(output.status_code, 200) output_text = output.get_data(as_text=True) self.assertIn( - 'Overview - test - Pagure', + 'PR#1: PR from the feature branch - test\n - Pagure', output_text) self.assertIn( '\n Fork is empty, there are no '