mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-10-31 23:22:49 +00:00
Fix cnames
This commit is contained in:
parent
ad1ce4ed08
commit
bb12346132
2 changed files with 3 additions and 5 deletions
|
@ -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):
|
||||
|
|
|
@ -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(interface_parent__in=all_active_assigned_interfaces())
|
||||
.filter(cname__interface_parent__in=all_active_assigned_interfaces())
|
||||
.prefetch_related('cname'))
|
||||
|
||||
@staticmethod
|
||||
|
|
Loading…
Reference in a new issue