Merge "Add Dashboard OS Selection Menu on Booking"

[laas.git] / src / api / serializers.py

diff --git a/src/api/serializers.py b/src/api/serializers.py
index 237ca02..5ef32d6 100644 (file)
--- a/src/api/serializers.py
+++ b/src/api/serializers.py
@@ -16,10 +16,11 @@ from dashboard.models import Server, Resource, ResourceStatus
 class BookingSerializer(serializers.ModelSerializer):
     installer_name = serializers.CharField(source='installer.name')
     scenario_name = serializers.CharField(source='scenario.name')
+    opsys_name = serializers.CharField(source='opsys.name')
 
     class Meta:
         model = Booking
-        fields = ('id', 'resource_id', 'start', 'end', 'installer_name', 'scenario_name', 'purpose')
+        fields = ('id', 'resource_id', 'start', 'end', 'opsys_name', 'installer_name', 'scenario_name', 'purpose')
 
 
 class ServerSerializer(serializers.ModelSerializer):
@@ -31,7 +32,7 @@ class ServerSerializer(serializers.ModelSerializer):
 class ResourceSerializer(serializers.ModelSerializer):
     class Meta:
         model = Resource
-        fields = ('id', 'name', 'description', 'url', 'server_set')
+        fields = ('id', 'name', 'description', 'url', 'server_set', 'dev_pod')
 
 class ResourceStatusSerializer(serializers.ModelSerializer):
     class Meta: