Merge pull request #151 from rackerlabs/add-ids-to-agent-and-scancomm…

…and-serializer Adding IDs to Agent and ScanCommand API serializers
rackerlabs · Jan 13, 2020 · 2e2388f · 2e2388f
2 parents b724ae8 + fefb370
commit 2e2388f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/master/django_scantron/__init__.py b/master/django_scantron/__init__.py
@@ -1 +1 @@
-__version__ = "1.16"
+__version__ = "1.17"
diff --git a/master/django_scantron/admin.py b/master/django_scantron/admin.py
@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 # from django.contrib.auth.decorators import login_required
 from django.contrib.sessions.models import Session
 from . import models
@@ -21,7 +22,7 @@ class AgentAdmin(admin.ModelAdmin):
 
     list_display = ("id", "scan_agent", "description", "api_token", "last_checkin")
 
-    readonly_fields = ("id", "scan_agent", "api_token")
+    readonly_fields = ("id", "scan_agent", "api_token", "last_checkin")
 
 
 class ScanCommandAdmin(admin.ModelAdmin):

diff --git a/master/django_scantron/api/serializers.py b/master/django_scantron/api/serializers.py
@@ -16,17 +16,14 @@
 class AgentSerializer(serializers.ModelSerializer):
     class Meta:
         model = Agent
-        fields = (
-            "scan_agent",
-            "description",
-            "api_token",
-        )
+        fields = ("id", "scan_agent", "description", "api_token", "last_checkin")
 
 
 class ScanCommandSerializer(serializers.ModelSerializer):
     class Meta:
         model = ScanCommand
         fields = (
+            "id",
             "scan_binary",
             "scan_command_name",
             "scan_command",