From 4497e257c3eda9c8614f67a44b0da23b1f1af367 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Aug 22 2018 10:52:36 +0000
Subject: Allow deleting branches in forks regardless of ALLOW_DELETE_BRANCH


Basically, even if main project are not allowed to delete branches
forks should be.

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

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

---

diff --git a/pagure/templates/repo_branches.html b/pagure/templates/repo_branches.html
index 7fd5b83..5661f2f 100644
--- a/pagure/templates/repo_branches.html
+++ b/pagure/templates/repo_branches.html
@@ -76,7 +76,10 @@
                                     <i class="fa fa-fw fa-list-alt"></i>
                                     </a>
                                 </div>
-                                {% if g.repo_committer and branch != head and config.get('ALLOW_DELETE_BRANCH', True) %}
+                                {% if g.repo_committer and branch != head
+                                      and (
+                                        config.get('ALLOW_DELETE_BRANCH', True)
+                                        or repo.is_fork) %}
                                     <form id="delete_branch_form-{{
                                         branch | replace('/', '__') | replace('+', '___')
                                         }}" action="{{
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 325f8ed..22a9089 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -2272,7 +2272,8 @@ def edit_file(repo, branchname, filename, username=None, namespace=None):
 def delete_branch(repo, branchname, username=None, namespace=None):
     """ Delete the branch of a project.
     """
-    if not pagure_config.get('ALLOW_DELETE_BRANCH', True):
+    if not flask.g.repo.is_fork and \
+            not pagure_config.get('ALLOW_DELETE_BRANCH', True):
         flask.abort(
             404, 'This pagure instance does not allow branch deletion')
 
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index c008b52..418b9dd 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -5248,9 +5248,64 @@ index 0000000..fb7093d
 
         user = tests.FakeUser(username = 'pingou')
         with tests.user_set(self.app.application, user):
+            # Check if the delete branch button does not show
+            output = self.app.get('/test/branches')
+            self.assertEqual(output.status_code, 200)
+            self.assertNotIn(
+                'title="Remove branch foo"',
+                output.get_data(as_text=True))
+
             # Delete the branch
             output = self.app.post('/test/b/foo/delete', follow_redirects=True)
             self.assertEqual(output.status_code, 404)
+            self.assertIn(
+                'This pagure instance does not allow branch deletion',
+                output.get_data(as_text=True))
+
+    @patch.dict('pagure.config.config', {'ALLOW_DELETE_BRANCH': False})
+    def test_delete_branch_disabled_fork(self):
+        """ Test the delete_branch endpoint when it's disabled in the entire
+        instance. """
+        item = pagure.lib.model.Project(
+            user_id=2,  # foo
+            name='test',
+            description='test project #1',
+            hook_token='aaabbb',
+            is_fork=True,
+            parent_id=1,
+        )
+        self.session.add(item)
+        self.session.commit()
+        tests.create_projects_git(
+            os.path.join(self.path, 'repos', 'forks', 'foo'), bare=True)
+
+        # Add a branch that we can delete
+        path = os.path.join(self.path, 'repos', 'forks', 'foo', 'test.git')
+        tests.add_content_git_repo(path)
+        repo = pygit2.Repository(path)
+        repo.create_branch('foo', repo.head.get_object())
+
+        user = tests.FakeUser(username = 'foo')
+        with tests.user_set(self.app.application, user):
+            # Check if the delete branch button shows
+            output = self.app.get('/fork/foo/test/branches')
+            self.assertEqual(output.status_code, 200)
+            self.assertIn(
+                'title="Remove branch foo"',
+                output.get_data(as_text=True))
+
+            # Delete the branch
+            output = self.app.post(
+                '/fork/foo/test/b/foo/delete',
+                follow_redirects=True)
+            self.assertEqual(output.status_code, 200)
+
+            # Check if the delete branch button no longer appears
+            output = self.app.get('/fork/foo/test/branches')
+            self.assertEqual(output.status_code, 200)
+            self.assertNotIn(
+                'title="Remove branch foo"',
+                output.get_data(as_text=True))
 
     def test_view_docs(self):
         """ Test the view_docs endpoint. """