diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py index 19e3dc9db..b4ed17556 100644 --- a/apps/assets/api/asset.py +++ b/apps/assets/api/asset.py @@ -42,7 +42,6 @@ class AssetViewSet(FilterAssetByNodeMixin, OrgBulkModelViewSet): ordering_fields = ("hostname", "ip", "port", "cpu_cores") serializer_classes = { 'default': serializers.AssetSerializer, - 'single': serializers.AssetVerboseSerializer, } permission_classes = (IsOrgAdminOrAppUser,) extra_filter_backends = [FilterAssetByNodeFilterBackend, LabelFilterBackend, IpInFilterBackend] diff --git a/apps/assets/migrations/0073_auto_20210606_1142.py b/apps/assets/migrations/0073_auto_20210606_1142.py index 5ba47716d..e3ca122ce 100644 --- a/apps/assets/migrations/0073_auto_20210606_1142.py +++ b/apps/assets/migrations/0073_auto_20210606_1142.py @@ -5,7 +5,6 @@ from django.db import migrations, models, transaction import django.db.models.deletion - def migrate_system_assets_to_authbook(apps, schema_editor): system_user_model = apps.get_model("assets", "SystemUser") system_user_asset_model = system_user_model.assets.through diff --git a/apps/assets/serializers/asset.py b/apps/assets/serializers/asset.py index 34a6c478d..6ed7990c8 100644 --- a/apps/assets/serializers/asset.py +++ b/apps/assets/serializers/asset.py @@ -8,7 +8,7 @@ from orgs.mixins.serializers import BulkOrgResourceModelSerializer from ..models import Asset, Node, Platform, SystemUser __all__ = [ - 'AssetSerializer', 'AssetSimpleSerializer', 'AssetVerboseSerializer', + 'AssetSerializer', 'AssetSimpleSerializer', 'ProtocolsField', 'PlatformSerializer', 'AssetTaskSerializer', ] @@ -80,7 +80,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer): 'hardware_info', 'connectivity', 'date_verified' ] fields_fk = [ - 'domain', 'domain_display', 'platform', 'admin_user', + 'domain', 'domain_display', 'platform', 'admin_user', 'admin_user_display' ] fields_m2m = [ 'nodes', 'nodes_display', 'labels', @@ -109,7 +109,7 @@ class AssetSerializer(BulkOrgResourceModelSerializer): @classmethod def setup_eager_loading(cls, queryset): """ Perform necessary eager loading of data. """ - queryset = queryset.prefetch_related('domain', 'platform') + queryset = queryset.prefetch_related('domain', 'platform', 'admin_user') queryset = queryset.prefetch_related('nodes', 'labels') return queryset @@ -156,15 +156,6 @@ class AssetSerializer(BulkOrgResourceModelSerializer): return instance -class AssetVerboseSerializer(AssetSerializer): - admin_user = serializers.PrimaryKeyRelatedField( - queryset=SystemUser.objects, label=_('Admin user') - ) - - class Meta(AssetSerializer.Meta): - fields = AssetSerializer.Meta.fields + ['admin_user_display'] - - class PlatformSerializer(serializers.ModelSerializer): meta = serializers.DictField(required=False, allow_null=True, label=_('Meta'))