Refactor to /opt/planetstack, final tweaks to make sure planetstack can run in non...

[plstackapi.git] / planetstack / core / serializers.py

diff --git a/plstackapi/core/serializers.py b/planetstack/core/serializers.py
similarity index 98%
rename from plstackapi/core/serializers.py
rename to planetstack/core/serializers.py
index a341508..55cf7c8 100644 (file)
--- a/plstackapi/core/serializers.py
+++ b/planetstack/core/serializers.py
@@ -1,6 +1,6 @@
 from django.forms import widgets
 from rest_framework import serializers
-from plstackapi.core.models import *
+from core.models import *
 
 
 class RoleSerializer(serializers.HyperlinkedModelSerializer):
@@ -20,9 +20,10 @@ class UserSerializer(serializers.HyperlinkedModelSerializer):
     slice_memberships = serializers.HyperlinkedRelatedField(view_name='slice-membership-detail')
     site_privileges = serializers.HyperlinkedRelatedField(view_name='site-privilege-detail')
     class Meta:
-        model = PLUser
+        model = User
         fields = ('id',
                   'user_id', 
+                  'kuser_id', 
                   'firstname', 
                   'lastname',
                   'email', 
@@ -193,7 +194,7 @@ class ImageSerializer(serializers.HyperlinkedModelSerializer):
 
 serializerLookUp = { 
                  Role: RoleSerializer,
-                 PLUser: UserSerializer,
+                 User: UserSerializer,
                  Key: KeySerializer,
                  Site: SiteSerializer,
                  SitePrivilege: SitePrivilegeSerializer,