git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
key is now just an attribute of the user model. Added 'creator' field to sliver model
[plstackapi.git]
/
planetstack
/
core
/
serializers.py
diff --git
a/planetstack/core/serializers.py
b/planetstack/core/serializers.py
index
bc4dd01
..
fd0c6c6
100644
(file)
--- a/
planetstack/core/serializers.py
+++ b/
planetstack/core/serializers.py
@@
-28,8
+28,9
@@
class UserSerializer(serializers.HyperlinkedModelSerializer):
'firstname',
'lastname',
'email',
'firstname',
'lastname',
'email',
- 'password',
- 'phone',
+ 'password',
+ 'phone',
+ 'public_key',
'user_url',
'is_admin',
'site',
'user_url',
'is_admin',
'site',
@@
-123,13
+124,13
@@
class SitePrivilegeSerializer(serializers.HyperlinkedModelSerializer):
'site',
'role')
'site',
'role')
-class Deployment
Network
Serializer(serializers.HyperlinkedModelSerializer):
+class DeploymentSerializer(serializers.HyperlinkedModelSerializer):
# HyperlinkedModelSerializer doesn't include the id by default
id = serializers.Field()
sites = serializers.HyperlinkedRelatedField(view_name='deploymentnetwork-detail')
class Meta:
# HyperlinkedModelSerializer doesn't include the id by default
id = serializers.Field()
sites = serializers.HyperlinkedRelatedField(view_name='deploymentnetwork-detail')
class Meta:
- model = Deployment
Network
+ model = Deployment
fields = ('id',
'name',
'sites'
fields = ('id',
'name',
'sites'
@@
-189,7
+190,7
@@
serializerLookUp = {
SliceMembership: SliceMembershipSerializer,
Node: NodeSerializer,
Sliver: SliverSerializer,
SliceMembership: SliceMembershipSerializer,
Node: NodeSerializer,
Sliver: SliverSerializer,
- Deployment
Network: DeploymentNetwork
Serializer,
+ Deployment
: Deployment
Serializer,
Image: ImageSerializer,
None: None,
}
Image: ImageSerializer,
None: None,
}