Require "manage:organization" to manage org

Author: divbzero

tests/unit/accounts/test_views.py

@@ -2259,9 +2259,7 @@ def test_verify_organization_role(
             )
             if desired_role == "Owner"
             # TODO: Test redirecting to managing organization projects.
-            else pretend.call(
-                "manage.organization.roles", organization_name=organization.name
-            )
+            else pretend.call("manage.organizations")
         ]
 
     @pytest.mark.parametrize(

warehouse/accounts/views.py

@@ -996,11 +996,7 @@ def _error(message):
         #         "manage.organization.projects", name=organization.name
         #     )
         # )
-        return HTTPSeeOther(
-            request.route_path(
-                "manage.organization.roles", organization_name=organization.name
-            )
-        )
+        return HTTPSeeOther(request.route_path("manage.organizations"))
 
 
 @view_config(

warehouse/locale/messages.pot

@@ -135,7 +135,7 @@ msgid "Invalid token: request a new password reset link"
 msgstr ""
 
 #: warehouse/accounts/views.py:655 warehouse/accounts/views.py:753
-#: warehouse/accounts/views.py:850 warehouse/accounts/views.py:1030
+#: warehouse/accounts/views.py:850 warehouse/accounts/views.py:1026
 msgid "Invalid token: no token supplied"
 msgstr ""
 
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Invalid token: request a new organization invite"
 msgstr ""
 
-#: warehouse/accounts/views.py:854 warehouse/accounts/views.py:1034
+#: warehouse/accounts/views.py:854 warehouse/accounts/views.py:1030
 msgid "Invalid token: not a collaboration invitation token"
 msgstr ""
 
@@ -221,27 +221,27 @@ msgstr ""
 msgid "You are now ${role} of the '${organization_name}' organization."
 msgstr ""
 
-#: warehouse/accounts/views.py:1026
+#: warehouse/accounts/views.py:1022
 msgid "Expired token: request a new project role invite"
 msgstr ""
 
-#: warehouse/accounts/views.py:1028
+#: warehouse/accounts/views.py:1024
 msgid "Invalid token: request a new project role invite"
 msgstr ""
 
-#: warehouse/accounts/views.py:1038
+#: warehouse/accounts/views.py:1034
 msgid "Role invitation is not valid."
 msgstr ""
 
-#: warehouse/accounts/views.py:1053
+#: warehouse/accounts/views.py:1049
 msgid "Role invitation no longer exists."
 msgstr ""
 
-#: warehouse/accounts/views.py:1065
+#: warehouse/accounts/views.py:1061
 msgid "Invitation for '${project_name}' is declined."
 msgstr ""
 
-#: warehouse/accounts/views.py:1132
+#: warehouse/accounts/views.py:1128
 msgid "You are now ${role} of the '${project_name}' project."
 msgstr ""
 

warehouse/manage/views.py

@@ -1194,7 +1194,7 @@ def create_organization(self):
     renderer="manage/organization/roles.html",
     uses_session=True,
     require_methods=False,
-    # permission="manage:organization",
+    permission="manage:organization",
     has_translations=True,
     require_reauth=True,
 )
@@ -1346,7 +1346,7 @@ def manage_organization_roles(
     context=Organization,
     uses_session=True,
     require_methods=["POST"],
-    # permission="manage:organization",
+    permission="manage:organization",
     has_translations=True,
 )
 def revoke_organization_invitation(organization, request):
@@ -1424,7 +1424,7 @@ def revoke_organization_invitation(organization, request):
     context=Organization,
     uses_session=True,
     require_methods=["POST"],
-    # permission="manage:organization",
+    permission="manage:organization",
     has_translations=True,
     require_reauth=True,
 )
@@ -1499,7 +1499,7 @@ def change_organization_role(
     context=Organization,
     uses_session=True,
     require_methods=["POST"],
-    # permission="manage:organization",
+    permission="manage:organization",
     has_translations=True,
     require_reauth=True,
 )