commit de9428061da2f5345c7c0524a89b20983fdaf8cf
author Adrià Vilanova Martínez <me@avm99963.com> Fri Jul 15 14:06:55 2022 +0200
committer gerritbot <gerritbot@avm99963.com> Fri Jul 15 14:45:47 2022 +0200
tree ec00696ca2f94245d4ea7eea5cef07f25727d14f
parent 2356fffd0aa91c404de82815f34699f781b0ffef

Merge branch 'main' into avm99963-monorail

Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e

GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1

framework/permissions.py

diff --git a/framework/permissions.py b/framework/permissions.py
index eb40dc7..ac46af6 100644
--- a/framework/permissions.py
+++ b/framework/permissions.py
@@ -104,7 +104,6 @@
 # Permission to flag any artifact as spam.
 FLAG_SPAM = 'FlagSpam'
 VERDICT_SPAM = 'VerdictSpam'
-MODERATE_SPAM = 'ModerateSpam'
 
 # Permissions for custom fields.
 EDIT_FIELD_DEF = 'EditFieldDef'
@@ -123,10 +122,10 @@
     tracker_pb2.ApprovalStatus.NOT_APPROVED]
 
 STANDARD_ADMIN_PERMISSIONS = [
-    EDIT_PROJECT, CREATE_PROJECT, PUBLISH_PROJECT, VIEW_DEBUG,
-    EDIT_OTHER_USERS, CUSTOMIZE_PROCESS,
-    VIEW_QUOTA, EDIT_QUOTA, ADMINISTER_SITE,
-    EDIT_ANY_MEMBER_NOTES, VERDICT_SPAM, MODERATE_SPAM]
+    EDIT_PROJECT, CREATE_PROJECT, PUBLISH_PROJECT, VIEW_DEBUG, EDIT_OTHER_USERS,
+    CUSTOMIZE_PROCESS, VIEW_QUOTA, EDIT_QUOTA, ADMINISTER_SITE,
+    EDIT_ANY_MEMBER_NOTES, VERDICT_SPAM
+]
 
 STANDARD_ISSUE_PERMISSIONS = [
     VIEW, EDIT_ISSUE, ADD_ISSUE_COMMENT, DELETE_ISSUE, FLAG_SPAM]
@@ -315,18 +314,16 @@
     consider_restrictions=False)
 
 ADMIN_PERMISSIONSET = PermissionSet(
-    [VIEW, VIEW_CONTRIBUTOR_LIST,
-     CREATE_PROJECT, EDIT_PROJECT, PUBLISH_PROJECT, VIEW_DEBUG,
-     COMMIT, CUSTOMIZE_PROCESS, FLAG_SPAM, VERDICT_SPAM, SET_STAR,
-     ADMINISTER_SITE, VIEW_EXPIRED_PROJECT, EDIT_OTHER_USERS,
-     VIEW_QUOTA, EDIT_QUOTA,
-     CREATE_ISSUE, ADD_ISSUE_COMMENT, EDIT_ISSUE, DELETE_ISSUE,
-     EDIT_ISSUE_APPROVAL,
-     VIEW_INBOUND_MESSAGES,
-     DELETE_ANY, EDIT_ANY_MEMBER_NOTES,
-     CREATE_GROUP, EDIT_GROUP, DELETE_GROUP, VIEW_GROUP,
-     MODERATE_SPAM, CREATE_HOTLIST],
-     consider_restrictions=False)
+    [
+        VIEW, VIEW_CONTRIBUTOR_LIST, CREATE_PROJECT, EDIT_PROJECT,
+        PUBLISH_PROJECT, VIEW_DEBUG, COMMIT, CUSTOMIZE_PROCESS, FLAG_SPAM,
+        VERDICT_SPAM, SET_STAR, ADMINISTER_SITE, VIEW_EXPIRED_PROJECT,
+        EDIT_OTHER_USERS, VIEW_QUOTA, EDIT_QUOTA, CREATE_ISSUE,
+        ADD_ISSUE_COMMENT, EDIT_ISSUE, DELETE_ISSUE, EDIT_ISSUE_APPROVAL,
+        VIEW_INBOUND_MESSAGES, DELETE_ANY, EDIT_ANY_MEMBER_NOTES, CREATE_GROUP,
+        EDIT_GROUP, DELETE_GROUP, VIEW_GROUP, CREATE_HOTLIST
+    ],
+    consider_restrictions=False)
 
 GROUP_IMPORT_BORG_PERMISSIONSET = PermissionSet(
     [CREATE_GROUP, VIEW_GROUP, EDIT_GROUP])