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
fbf2c756
Commit
fbf2c756
authored
Jul 23, 2018
by
Lukas Burgey
Browse files
Make minor changes to the DeploymentStateItems
parent
0af95896
Changes
2
Hide whitespace changes
Inline
Side-by-side
django_backend/backend/frontend/serializers.py
View file @
fbf2c756
...
...
@@ -47,6 +47,7 @@ class DeploymentStateItemSerializer(serializers.ModelSerializer):
'service'
,
#'services',
'group'
,
'message'
,
]
...
...
django_backend/backend/models.py
View file @
fbf2c756
...
...
@@ -757,8 +757,6 @@ class Deployment(models.Model):
for
state
in
self
.
states
.
all
():
state
.
service_added
(
service
)
# remove key and track changes in the key lists
def
remove_key
(
self
,
key
):
if
not
self
.
is_active
:
...
...
@@ -1000,17 +998,21 @@ class DeploymentStateItem(models.Model):
# message for the user
message
=
models
.
TextField
(
max_length
=
300
,
blank
=
True
,
default
=
''
,
)
# questions for the user (needed for deployment
questionnaire
=
JSONField
(
default
=
questionnaire_default
,
null
=
True
,
blank
=
True
,
)
# credentials for the service
# only valid when state == deployed
credentials
=
JSONField
(
default
=
credential_default
,
null
=
True
,
blank
=
True
,
)
@
property
...
...
@@ -1103,8 +1105,8 @@ class DeploymentStateItem(models.Model):
self
.
credentials
=
output
.
get
(
'credentials'
,
{})
self
.
save
()
elif
status
==
'not_deployed'
:
self
.
credentials
=
credential_default
()
self
.
questionnaire
=
questionnaire_defaul
t
()
# reset
credentials
and questi
self
.
_rese
t
()
self
.
save
()
elif
status
==
'questionnaire'
:
self
.
questionnaire
=
output
.
get
(
'questionnaire'
,
{})
...
...
@@ -1114,13 +1116,19 @@ class DeploymentStateItem(models.Model):
elif
status
==
'failed'
:
pass
else
:
return
'unknown state '
+
status
return
'unknown state
\'
'
+
status
+
'
\'
'
self
.
_set_state
(
status
)
return
None
return
'missing status in output'
# resets all client sent values
def
_reset
(
self
):
self
.
credentials
=
credential_default
()
self
.
questionnaire
=
questionnaire_default
()
self
.
message
=
''
def
msg
(
self
,
msg
):
return
'[DSItem:{}] {}'
.
format
(
self
,
msg
)
...
...
Write
Preview
Markdown
is supported
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