Merge branch 'new_api' into ops

160b01ec · ibuler · 17ddb3bb · ffa7e580 · 160b01ec
Commit 160b01ec authored Dec 13, 2017 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

serializers.py apps/terminal/serializers.py +4 -1

No files found.
--- a/apps/terminal/serializers.py
+++ b/apps/terminal/serializers.py
@@ -23,7 +23,10 @@ class TerminalSerializer(serializers.ModelSerializer):
    @staticmethod
    def get_is_alive(obj):
-        status = obj.status_set.latest()
+        try:
+            status = obj.status_set.latest()
+        except Status.DoesNotExist:
+            status = None
        if not status:
            return False