Skip to content
Snippets Groups Projects
Commit 625846a1 authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

TMSS-183: added nested url for subtask/id/state_log

parent b72b320a
No related branches found
No related tags found
No related merge requests found
......@@ -197,4 +197,4 @@ class SubtaskSerializerJSONeditorOnline(RelationalHyperlinkedModelSerializer):
class Meta:
model = models.Subtask
#fields = '__all__'
exclude = ('created_or_updated_by_user',)
\ No newline at end of file
exclude = ('created_or_updated_by_user',)
......@@ -48,8 +48,14 @@ class SubtaskStateViewSet(LOFARViewSet):
class SubtaskStateLogViewSet(LOFARViewSet):
queryset = models.SubtaskStateLog.objects.all()
serializer_class = serializers.SubtaskStateLogSerializer
def get_queryset(self):
if 'subtask_pk' in self.kwargs:
subtask = get_object_or_404(models.Subtask, pk=self.kwargs['subtask_pk'])
return subtask.subtaskstatelog_set.all()
queryset = models.SubtaskStateLog.objects.all()
# query by subtask
......@@ -59,10 +65,6 @@ class SubtaskStateLogViewSet(LOFARViewSet):
return queryset
queryset = models.SubtaskStateLog.objects.all()
serializer_class = serializers.SubtaskStateLogSerializer
class SubtaskTypeViewSet(LOFARViewSet):
queryset = models.SubtaskType.objects.all()
serializer_class = serializers.SubtaskTypeSerializer
......
......@@ -107,6 +107,7 @@ router.register(r'task_draft/(?P<task_draft_pk>\d+)/task_relation_draft', viewse
router.register(r'task_relation_draft/(?P<task_relation_draft_pk>\d+)/task_relation_blueprint', viewsets.TaskRelationBlueprintViewSet)
router.register(r'task_blueprint/(?P<task_blueprint_pk>\d+)/task_relation_blueprint', viewsets.TaskRelationBlueprintViewSet)
router.register(r'task_blueprint/(?P<task_blueprint_pk>\d+)/subtask', viewsets.SubtaskViewSet)
router.register(r'subtask/(?P<subtask_pk>[\w\-]+)/state_log', viewsets.SubtaskStateLogViewSet)
# SCHEDULING
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment