commit 29c287ffea52cb16872f8037348eda2fd008c9dd
author Tony Mack <tmack@paris.CS.Princeton.EDU> Thu Apr 11 21:07:16 2013 -0400
committer Tony Mack <tmack@paris.CS.Princeton.EDU> Thu Apr 11 21:07:16 2013 -0400
tree 8f6ac5589f9319c9e2d80c557b4f459a45fae7cb
parent 4bc09f221dd8e45c934623ee1d76fb5ffbf7580d

merge latest code

plstackapi/core/views/slices.py

diff --git a/plstackapi/core/views/slices.py b/plstackapi/core/views/slices.py
index 6015f4d..01415bb 100644
--- a/plstackapi/core/views/slices.py
+++ b/plstackapi/core/views/slices.py
@@ -40,7 +40,7 @@
         slices = get_slices(data['auth'], {'id': pk})
         if not slices:
             return Response(status=status.HTTP_404_NOT_FOUND)
-        serializer = UserSerializer(slices[0])
+        serializer = SliceSerializer(slices[0])
         return Response(serializer.data)                  
 
     def put(self, request, pk, format=None):
@@ -52,7 +52,7 @@
             return Response(status=status.HTTP_400_BAD_REQUEST)
 
         slice = update_slice(pk, data['slice'])
-        serializer = UserSerializer(slice)
+        serializer = SliceSerializer(slice)
         return Response(serializer.data) 
 
     def delete(self, request, pk, format=None):