Fix attribute export (#404)

rdmorganiser · Nov 19, 2021 · 896c921 · 896c921
1 parent 6c4c49d
commit 896c921
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/rdmo/domain/serializers/export.py b/rdmo/domain/serializers/export.py
@@ -6,7 +6,6 @@
 class AttributeExportSerializer(serializers.ModelSerializer):
 
     parent = serializers.CharField(source='parent.uri', default=None, read_only=True)
-    children = serializers.SerializerMethodField()
 
     class Meta:
         model = Attribute
@@ -16,10 +15,5 @@ class Meta:
             'key',
             'path',
             'comment',
-            'parent',
-            'children'
+            'parent'
         )
-
-    def get_children(self, obj):
-        # get the children from the cached mptt tree
-        return AttributeExportSerializer(obj.get_children(), many=True, read_only=True).data
diff --git a/rdmo/domain/viewsets.py b/rdmo/domain/viewsets.py
@@ -52,6 +52,7 @@ def export(self, request):
 
     @action(detail=True, url_path='export', permission_classes=[HasModelPermission])
     def detail_export(self, request, pk=None):
-        serializer = AttributeExportSerializer(self.get_object())
-        xml = AttributeRenderer().render([serializer.data])
+        queryset = self.get_object().get_descendants(include_self=True)
+        serializer = AttributeExportSerializer(queryset, many=True)
+        xml = AttributeRenderer().render(serializer.data)
         return XMLResponse(xml, name=self.get_object().key)