From fb61ba2b07a73e3940f1b78a057c58a3812c4c37 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 08 2015 13:21:09 +0000
Subject: [PATCH 1/4] Adjust is_repo_admin to check if the user logged is an admin via a group


This way, anyone having commit to a project via a group has basically
full access to the project, just as if that person was namely granted
the commit right to the project.

---

diff --git a/pagure/__init__.py b/pagure/__init__.py
index 3153926..1799d0b 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -148,8 +148,14 @@ def is_repo_admin(repo_obj):
 
     user = flask.g.fas_user.username
 
+    usergrps = [
+        usr.user
+        for grp in repo_obj.groups
+        for usr in grp.users]
+
     return user == repo_obj.user.user or (
-        user in [user.user for user in repo_obj.users])
+        user in [user.user for user in repo_obj.users]
+    ) or (user in usergrps)
 
 
 def generate_gitolite_acls():

From 070a239b31141de7996989b9956c0757d24a433a Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 08 2015 13:23:28 +0000
Subject: [PATCH 2/4] Adjust showing the Settings/Fork buttons


---

diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index a5189d8..caad683 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -87,7 +87,7 @@
 
     </ul>
     <ul class="right">
-      {% if g.fas_user and g.fas_user.username != repo.user.user %}
+      {% if not repo_admin %}
       <li id="fork_button" {% if select == '' %}class="selected" {% endif %}>
         <form method="POST" name="fork_project"
           action="{{ url_for(
@@ -96,8 +96,7 @@
           {{ forkbuttonform.csrf_token }}
         </form>
       </li>
-      {% endif %}
-      {% if g.fas_user and g.fas_user.username == repo.user.user %}
+      {% else %}
       <li id="settings_button" {% if select == 'settings' %}class="selected" {% endif %}>
         <a href="{{ url_for(
             '.view_settings', repo=repo.name, username=username) }}">

From af2eabf206adae954695aaadb1c2e0cf8a70bcb0 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 08 2015 13:23:44 +0000
Subject: [PATCH 3/4] Specify more often if the user is a repo_admin or not


---

diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index 67f1025..7eb2491 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -99,6 +99,7 @@ def request_pulls(repo, username=None):
         status=status,
         assignee=assignee,
         author=author,
+        repo_admin=is_repo_admin(repo),
     )
 
 
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index a20712b..4826033 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -398,6 +398,7 @@ def view_issues(repo, username=None):
         tags=tags,
         assignee=assignee,
         author=author,
+        repo_admin=is_repo_admin(repo),
     )
 
 
@@ -477,6 +478,7 @@ def new_issue(repo, username=None):
         form=form,
         repo=repo,
         username=username,
+        repo_admin=is_repo_admin(repo),
     )
 
 
@@ -642,6 +644,7 @@ def edit_issue(repo, issueid, username=None):
         username=username,
         issue=issue,
         issueid=issueid,
+        repo_admin=is_repo_admin(repo),
     )
 
 
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index c4c8ed7..68e68f7 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -606,6 +606,7 @@ def view_tree(repo, identifier=None, username=None):
         filename='',
         content=content,
         output_type=output_type,
+        repo_admin=is_repo_admin(repo),
     )
 
 
@@ -626,6 +627,7 @@ def view_forks(repo, username=None):
         select='forks',
         username=username,
         repo=repo,
+        repo_admin=is_repo_admin(repo),
     )
 
 

From 028a7e721e8991d86febd16026df26da02ed3696 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 08 2015 13:29:49 +0000
Subject: [PATCH 4/4] Ensure the user is logged in to show the Settings/Fork buttons


---

diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index caad683..d906ab6 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -87,6 +87,7 @@
 
     </ul>
     <ul class="right">
+      {% if authenticated %}
       {% if not repo_admin %}
       <li id="fork_button" {% if select == '' %}class="selected" {% endif %}>
         <form method="POST" name="fork_project"
@@ -103,6 +104,7 @@
           Settings</a>
       </li>
       {% endif %}
+      {% endif %}
     </ul>
   </div>
 {% block repo %}