Merge branch 'fix_cnames' into 'dev'

Fix cnames

See merge request federez/re2o!238

api/serializers.py

@@ -816,13 +816,12 @@ class CNAMERecordSerializer(serializers.ModelSerializer):
     """Serialize `machines.models.Domain` objects with the data needed to
     generate a CNAME DNS record.
     """
-    alias = serializers.CharField(source='cname.name', read_only=True)
+    alias = serializers.CharField(source='cname', read_only=True)
     hostname = serializers.CharField(source='name', read_only=True)
-    extension = serializers.CharField(source='extension.name', read_only=True)
 
     class Meta:
         model = machines.Domain
-        fields = ('alias', 'hostname', 'extension')
+        fields = ('alias', 'hostname')
 
 
 class DNSZonesSerializer(serializers.ModelSerializer):

machines/models.py

@@ -712,8 +712,7 @@ class Extension(RevMixin, AclMixin, models.Model):
         from re2o.utils import all_active_assigned_interfaces
         return (Domain.objects
                 .filter(extension=self)
-                .filter(cname__isnull=False)
+                .filter(cname__interface_parent__in=all_active_assigned_interfaces())
-                .filter(interface_parent__in=all_active_assigned_interfaces())
                 .prefetch_related('cname'))
 
     @staticmethod