Browse Source

Another cleaning pass after url/acl/api removal from serializers

Rafał Pitoń 7 years ago
parent
commit
7fa7cc455a
2 changed files with 10 additions and 24 deletions
  1. 10 2
      misago/categories/serializers.py
  2. 0 22
      misago/users/serializers/auth.py

+ 10 - 2
misago/categories/serializers.py

@@ -22,8 +22,16 @@ def last_activity_detail(f):
         if not obj.last_thread_id:
         if not obj.last_thread_id:
             return None
             return None
 
 
-        acl = self.get_acl(obj)
-        tested_acls = (acl.get('can_see'), acl.get('can_browse'), acl.get('can_see_all_threads'), )
+        try:
+            acl = obj.acl
+        except AttributeError:
+            return None
+            
+        tested_acls = (
+            acl.get('can_see'),
+            acl.get('can_browse'),
+            acl.get('can_see_all_threads'),
+        )
 
 
         if not all(tested_acls):
         if not all(tested_acls):
             return None
             return None

+ 0 - 22
misago/users/serializers/auth.py

@@ -29,24 +29,9 @@ class AuthenticatedUserSerializer(UserSerializer):
             'subscribe_to_replied_threads',
             'subscribe_to_replied_threads',
         ]
         ]
 
 
-    def get_acl(self, obj):
-        return serialize_acl(obj)
-
     def get_email(self, obj):
     def get_email(self, obj):
         return obj.email
         return obj.email
 
 
-    def get_api(self, obj):
-        return {
-            'avatar': reverse('misago:api:user-avatar', kwargs={'pk': obj.pk}),
-            'details': reverse('misago:api:user-details', kwargs={'pk': obj.pk}),
-            'change_email': reverse('misago:api:user-change-email', kwargs={'pk': obj.pk}),
-            'change_password': reverse('misago:api:user-change-password', kwargs={'pk': obj.pk}),
-            'edit_details': reverse('misago:api:user-edit-details', kwargs={'pk': obj.pk}),
-            'options': reverse('misago:api:user-forum-options', kwargs={'pk': obj.pk}),
-            'username': reverse('misago:api:user-username', kwargs={'pk': obj.pk}),
-            'delete': reverse('misago:api:user-delete-own-account', kwargs={'pk': obj.pk}),
-        }
-
 
 
 AuthenticatedUserSerializer = AuthenticatedUserSerializer.exclude_fields(
 AuthenticatedUserSerializer = AuthenticatedUserSerializer.exclude_fields(
     'is_avatar_locked',
     'is_avatar_locked',
@@ -61,13 +46,6 @@ AuthenticatedUserSerializer = AuthenticatedUserSerializer.exclude_fields(
 
 
 class AnonymousUserSerializer(serializers.Serializer):
 class AnonymousUserSerializer(serializers.Serializer):
     id = serializers.ReadOnlyField()
     id = serializers.ReadOnlyField()
-    acl = serializers.SerializerMethodField()
-
-    def get_acl(self, obj):
-        if hasattr(obj, 'acl_cache'):
-            return serialize_acl(obj)
-        else:
-            return {}
 
 
 
 
 class LoginSerializer(serializers.Serializer, AuthMixin):
 class LoginSerializer(serializers.Serializer, AuthMixin):