Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
feudal
feudalBackend
Commits
b6a5affc
Commit
b6a5affc
authored
Aug 20, 2018
by
Lukas Burgey
Browse files
Fix serializers
parent
55c939c3
Changes
3
Hide whitespace changes
Inline
Side-by-side
feudal/backend/models/serializers/clients.py
View file @
b6a5affc
...
...
@@ -49,11 +49,6 @@ class NewDeploymentsSerializer(serializers.Serializer):
)
#class SiteSerializer(serializers.Serializer):
# state_items = NewDeploymentStateItemSerializer(many=True)
class
RabbitMQInstanceSerializer
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
models
.
RabbitMQInstance
...
...
feudal/backend/models/serializers/webpage.py
View file @
b6a5affc
...
...
@@ -30,7 +30,6 @@ class ServiceSerializer(serializers.ModelSerializer):
class
NewDeploymentStateItemSerializer
(
serializers
.
ModelSerializer
):
service
=
ServiceSerializer
()
#services = ServiceSerializer(many=True)
site
=
SiteSerializer
()
questionnaire
=
serializers
.
JSONField
()
credentials
=
serializers
.
JSONField
()
...
...
@@ -45,7 +44,6 @@ class NewDeploymentStateItemSerializer(serializers.ModelSerializer):
'questionnaire'
,
'credentials'
,
'service'
,
#'services',
'group'
,
'message'
,
]
...
...
@@ -88,12 +86,12 @@ class UserSerializer(serializers.ModelSerializer):
# contains properties which change a lot
class
UserStateSerializer
(
serializers
.
ModelSerializer
):
deployment_state_items
=
NewDeploymentStateItemSerializer
(
many
=
True
)
#
deployment_state_items = NewDeploymentStateItemSerializer(many=True)
deployments
=
NewDeploymentSerializer
(
many
=
True
)
class
Meta
:
model
=
models
.
User
fields
=
[
'deployment_state_items'
,
#
'deployment_state_items',
'deployments'
,
]
feudal/backend/views/clients.py
View file @
b6a5affc
...
...
@@ -7,7 +7,7 @@ from rest_framework import generics, views
from
rest_framework.authentication
import
BasicAuthentication
from
rest_framework.response
import
Response
from
..models.serializers.
webpage
import
NewDeploymentSerializer
from
..models.serializers.
clients
import
NewDeploymentSerializer
from
..models.serializers.clients
import
RabbitMQInstanceSerializer
from
..
import
models
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment