diff --git a/apps/assets/models/asset/common.py b/apps/assets/models/asset/common.py index fba640e2f..8fd2d8a2c 100644 --- a/apps/assets/models/asset/common.py +++ b/apps/assets/models/asset/common.py @@ -21,9 +21,7 @@ logger = logging.getLogger(__name__) def default_node(): - from orgs.utils import current_org - from ..node import Node - return Node(id=current_org.id) + return [] class AssetManager(OrgManager): diff --git a/apps/assets/serializers/asset/common.py b/apps/assets/serializers/asset/common.py index ded10161d..0d4939086 100644 --- a/apps/assets/serializers/asset/common.py +++ b/apps/assets/serializers/asset/common.py @@ -227,6 +227,9 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali def validate_nodes(self, nodes): if nodes: return nodes + nodes_display = self.initial_data.get('nodes_display') + if nodes_display: + return nodes request = self.context.get('request') if not request: return []