tyrel/stagestatus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'nested_json' into 'master'

Browse Source 
nest the json

See merge request !12
This commit is contained in:
Tyrel Souza 2017-04-01 20:42:47 +00:00
commit 9257fbc5ab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stagestatus/apps/machines/api/serializers.py
View File

@ -8,7 +8,6 @@ class MachineReservationSerializer(serializers.ModelSerializer):
class Meta:
model = MachineReservation
fields = (
'machine',
'user',
'notes',
)
@ -19,7 +18,6 @@ class MachineStatusSerializer(serializers.ModelSerializer):
class Meta:
model = MachineStatus
fields = (
'machine',
'git_branch',
'git_version',
'last_db_refresh',
@ -29,6 +27,8 @@ class MachineStatusSerializer(serializers.ModelSerializer):
class MachineSerializer(serializers.ModelSerializer):
is_reserved = serializers.SerializerMethodField()
status = MachineStatusSerializer()
reservation = MachineReservationSerializer()
def get_is_reserved(self, machine):
return machine.is_reserved()