From: Scott Baker <smbaker@gmail.com>
Date: Thu, 19 Jun 2014 22:24:58 +0000 (-0700)
Subject: fix datetime not serializable in shell view
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0b48b4b7f6551d92eb79776621e2f36a91bee073;p=plstackapi.git

fix datetime not serializable in shell view
---

diff --git a/planetstack/core/dashboard/views/shell.py b/planetstack/core/dashboard/views/shell.py
index 850dd02..7d23043 100644
--- a/planetstack/core/dashboard/views/shell.py
+++ b/planetstack/core/dashboard/views/shell.py
@@ -1,19 +1,31 @@
 # /opt/planetstack/core/dashboard/views/helloworld.py
+import datetime
 import os
 import sys
+import time
 import json
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseForbidden
 from django.views.generic import TemplateView, View
 from core.models import *
 from django.forms.models import model_to_dict
 
+def ensure_serializable(d):
+    d2={}
+    for (k,v) in d.items():
+        # datetime is not json serializable
+        if isinstance(v, datetime.datetime):
+            d2[k] = time.mktime(v.timetuple())
+        else:
+            d2[k] = v
+    return d2
+
 class ShellDataView(View):
     url = r'^shelldata/'
 
     def get(self, request, **kwargs):
         allSlices = []
         for slice in Slice.objects.all():
-            allSlices.append(model_to_dict(slice))
+            allSlices.append(ensure_serializable(model_to_dict(slice)))
 
         result = {"slices": allSlices}