Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
AE UTBM
Sith
Commits
2f7030d9
Commit
2f7030d9
authored
Aug 19, 2016
by
Sli
Browse files
Fixed api's list bug
parent
6c107ed3
Pipeline
#126
failed with stage
in 2 minutes and 55 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
api/views/counter.py
View file @
2f7030d9
...
...
@@ -11,12 +11,14 @@ class CounterSerializer(serializers.ModelSerializer):
is_open
=
serializers
.
BooleanField
(
read_only
=
True
)
barman_list
=
serializers
.
ListField
(
child
=
serializers
.
IntegerField
()
child
=
serializers
.
IntegerField
(),
read_only
=
True
)
class
Meta
:
model
=
Counter
fields
=
(
'id'
,
'name'
,
'type'
,
'is_open'
,
'barman_list'
)
fields
=
(
'id'
,
'name'
,
'type'
,
'club'
,
'products'
,
'is_open'
,
'barman_list'
)
class
CounterViewSet
(
RightModelViewSet
):
...
...
api/views/launderette.py
View file @
2f7030d9
...
...
@@ -9,10 +9,12 @@ from api.views import RightModelViewSet
class
LaunderettePlaceSerializer
(
serializers
.
ModelSerializer
):
machine_list
=
serializers
.
ListField
(
child
=
serializers
.
IntegerField
()
child
=
serializers
.
IntegerField
(),
read_only
=
True
)
token_list
=
serializers
.
ListField
(
child
=
serializers
.
IntegerField
()
child
=
serializers
.
IntegerField
(),
read_only
=
True
)
class
Meta
:
...
...
@@ -24,7 +26,7 @@ class LaunderetteMachineSerializer(serializers.ModelSerializer):
class
Meta
:
model
=
Machine
fields
=
(
'id'
,
'name'
,
'is_working'
,
'launderette'
)
fields
=
(
'id'
,
'name'
,
'type'
,
'is_working'
,
'launderette'
)
class
LaunderetteTokenSerializer
(
serializers
.
ModelSerializer
):
...
...
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