From ee6de95a52429961a4aa8e94dcb9dc72dab261f9 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Fri, 10 Jul 2020 20:13:48 +0100
Subject: [PATCH] Allow editors to unapprove and delete packages

---
 app/flatpages/help/ranks_permissions.md | 15 +++++++++++++++
 app/models.py                           |  7 ++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/flatpages/help/ranks_permissions.md b/app/flatpages/help/ranks_permissions.md
index 93a337c9..5a2d5928 100644
--- a/app/flatpages/help/ranks_permissions.md
+++ b/app/flatpages/help/ranks_permissions.md
@@ -69,6 +69,21 @@ title: Ranks and Permissions
 			<th>✓</th> <!-- admin -->
 			<th>✓</th>
 		</tr>
+		<tr>
+			<td>Delete Package</td>
+			<th></th> <!-- new -->
+			<th></th>
+			<th></th> <!-- member -->
+			<th></th>
+			<th></th> <!-- trusted member -->
+			<th></th>
+			<th>✓</th> <!-- editor -->
+			<th>✓</th>
+			<th>✓</th> <!-- moderator -->
+			<th>✓</th>
+			<th>✓</th> <!-- admin -->
+			<th>✓</th>
+		</tr>
 		<tr>
 			<td>Edit Package</td>
 			<th></th> <!-- new -->
diff --git a/app/models.py b/app/models.py
index cda52380..2b12562f 100644
--- a/app/models.py
+++ b/app/models.py
@@ -708,9 +708,10 @@ class Package(db.Model):
 		elif perm == Permission.EDIT_MAINTAINERS:
 			return isOwner or user.rank.atLeast(UserRank.MODERATOR)
 
-		# Moderators can delete packages
-		elif perm == Permission.DELETE_PACKAGE or perm == Permission.UNAPPROVE_PACKAGE \
-				or perm == Permission.CHANGE_RELEASE_URL:
+		elif perm == Permission.UNAPPROVE_PACKAGE or perm == Permission.DELETE_PACKAGE:
+			return user.rank.atLeast(UserRank.EDITOR)
+
+		elif perm == Permission.CHANGE_RELEASE_URL:
 			return user.rank.atLeast(UserRank.MODERATOR)
 
 		else: