diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html index 0c30864..64e7080 100644 --- a/pagure/templates/settings.html +++ b/pagure/templates/settings.html @@ -1092,7 +1092,7 @@ {% if (not repo.is_fork and config.get('ENABLE_DEL_PROJECTS', True)) or - (repo.is_fork and not config.get('ENABLE_DEL_FORKS', + (repo.is_fork and config.get('ENABLE_DEL_FORKS', config.get('ENABLE_DEL_PROJECTS', True))) %}
diff --git a/tests/test_pagure_flask_ui_repo_delete_project.py b/tests/test_pagure_flask_ui_repo_delete_project.py index b26e508..902d1e5 100644 --- a/tests/test_pagure_flask_ui_repo_delete_project.py +++ b/tests/test_pagure_flask_ui_repo_delete_project.py @@ -88,6 +88,43 @@ class PagureFlaskDeleteRepotests(tests.Modeltests): projects = pagure.lib.search_projects(self.session) self.assertEqual(len(projects), 4) + @patch('pagure.lib.notify.send_email', MagicMock(return_value=True)) + @patch('pagure.ui.repo.admin_session_timedout', + MagicMock(return_value=False)) + def test_delete_button_present(self): + """ Test that the delete button is present when deletions are + allowed. + """ + + user = tests.FakeUser(username='pingou') + with tests.user_set(pagure.APP, user): + output = self.app.get('/test/settings') + self.assertEqual(output.status_code, 200) + self.assertIn('