Update perm api

apps/assets/api.py

@@ -13,14 +13,6 @@ from .models import AssetGroup, Asset, IDC, SystemUser, AdminUser
 from . import serializers
 
 
-class AssetGroupViewSet(viewsets.ModelViewSet):
-    """ API endpoint that allows AssetGroup to be viewed or edited.
-        some other comment
-    """
-    queryset = AssetGroup.objects.all()
-    serializer_class = serializers.AssetGroupSerializer
-
-
 class AssetViewSet(viewsets.ModelViewSet):
     """API endpoint that allows Asset to be viewed or edited."""
     queryset = Asset.objects.all()
@@ -34,6 +26,14 @@ class AssetViewSet(viewsets.ModelViewSet):
         return queryset
 
 
+class AssetGroupViewSet(viewsets.ModelViewSet):
+    """ API endpoint that allows AssetGroup to be viewed or edited.
+        some other comment
+    """
+    queryset = AssetGroup.objects.all()
+    serializer_class = serializers.AssetGroupSerializer
+
+
 class IDCViewSet(viewsets.ModelViewSet):
     """API endpoint that allows IDC to be viewed or edited."""
     queryset = IDC.objects.all()
@@ -68,7 +68,7 @@ class SystemUserViewSet(viewsets.ModelViewSet):
 
 class AssetListUpdateApi(BulkDeleteApiMixin, ListBulkCreateUpdateDestroyAPIView):
     queryset = Asset.objects.all()
-    serializer_class = serializers.AssetBulkUpdateSerializer
+    serializer_class = serializers.AssetSerializer
     permission_classes = (IsSuperUser,)
 
 

apps/assets/serializers.py

@@ -6,22 +6,11 @@ from common.mixins import BulkDeleteApiMixin
 from rest_framework_bulk import BulkListSerializer, BulkSerializerMixin
 
 
-class AssetBulkUpdateSerializer(BulkSerializerMixin, serializers.ModelSerializer):
-    # group_display = serializers.SerializerMethodField()
-    # active_display = serializers.SerializerMethodField()
-    #groups = serializers.PrimaryKeyRelatedField(many=True, queryset=AssetGroup.objects.all())
+class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer):
 
     class Meta(object):
         model = Asset
         list_serializer_class = BulkListSerializer
-        fields = ('id', 'port', 'idc')
-
-    # def get_group_display(self, obj):
-    #     return " ".join([group.name for group in obj.groups.all()])
-    #
-    # def get_active_display(self, obj):
-    #     # TODO: user ative state
-    #     return not (obj.is_expired and obj.is_active)
 
 
 class AssetGroupSerializer(serializers.ModelSerializer):
@@ -29,11 +18,6 @@ class AssetGroupSerializer(serializers.ModelSerializer):
         model = AssetGroup
 
 
-class AssetSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Asset
-
-
 class AdminUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = AdminUser