Use AdminPermission class for Organization (.users and .members)

With this pattern we can override them from Corporate using the same method we
already have, without confusions.

Note that .users and .members are exactly the same logic.

Author: humitos

readthedocs/core/permissions.py

@@ -7,15 +7,23 @@
 
 class AdminPermissionBase:
 
+    @classmethod
+    def admins(cls, project):
+        return project.users.all()
+
+    @classmethod
+    def members(cls, project):
+        return project.users.all()
+
     @classmethod
     def is_admin(cls, user, project):
         # This explicitly uses "user in project.users.all" so that
         # users on projects can be cached using prefetch_related or prefetch_related_objects
-        return user in project.users.all() or user.is_superuser
+        return user in cls.admins() or user.is_superuser
 
     @classmethod
-    def is_member(cls, user, obj):
-        return user in obj.users.all() or user.is_superuser
+    def is_member(cls, user, project):
+        return user in cls.members(project) or user.is_superuser
 
 
 class AdminPermission(SettingsOverrideObject):

readthedocs/organizations/models.py

@@ -9,6 +9,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from readthedocs.core.utils import slugify
+from readthedocs.core.permissions import AdminPermission
 
 from . import constants
 from .managers import TeamManager, TeamMemberManager
@@ -88,6 +89,14 @@ class Meta:
     def __str__(self):
         return self.name
 
+    @property
+    def users(self):
+        return AdminPermission.members(self)
+
+    @property
+    def members(self):
+        return AdminPermission.members(self)
+
     def get_absolute_url(self):
         return reverse('organization_detail', args=(self.slug,))