Merge "Adds Credential Manipulation"

[pharos-tools.git] / dashboard / src / api / serializers.py

diff --git a/dashboard/src/api/serializers.py b/dashboard/src/api/serializers.py
index 4478175..c371a92 100644 (file)
--- a/dashboard/src/api/serializers.py
+++ b/dashboard/src/api/serializers.py
@@ -10,16 +10,18 @@
 
 from rest_framework import serializers
 
+from notifier.models import Notifier
 from booking.models import Booking
 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):
@@ -37,3 +39,8 @@ class ResourceStatusSerializer(serializers.ModelSerializer):
     class Meta:
         model = ResourceStatus
         fields = ('id', 'resource', 'timestamp','type', 'title', 'content')
+
+class NotifierSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Notifier
+        fields = ('id', 'title', 'content', 'user', 'sender', 'message_type', 'msg_sent')