From dd580e670f944cf3de49a97fb2fb5931dba5f82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?= <jkuensem@physik.uni-bielefeld.de> Date: Fri, 6 Jul 2018 12:01:47 +0000 Subject: [PATCH] Task LSMR-14: Added serializers, viewsets and url routing for work request relation + blueprint --- .../src/lsmr/lsmrapp/serializers/specification.py | 15 +++++++++++++++ .../src/lsmr/lsmrapp/viewsets/specification.py | 9 +++++++++ SAS/LSMR/src/lsmr/urls.py | 6 ++++++ 3 files changed, 30 insertions(+) diff --git a/SAS/LSMR/src/lsmr/lsmrapp/serializers/specification.py b/SAS/LSMR/src/lsmr/lsmrapp/serializers/specification.py index c9fe8a5bf23..fb879c7c213 100644 --- a/SAS/LSMR/src/lsmr/lsmrapp/serializers/specification.py +++ b/SAS/LSMR/src/lsmr/lsmrapp/serializers/specification.py @@ -82,3 +82,18 @@ class WorkRequestSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = models.WorkRequestSerializer fields = '__all__' + + +class WorkRequestRelationBlueprintSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = models.WorkRequestRelationBlueprint + fields = '__all__' + + +class WorkRequestRelationSerializer(serializers.HyperlinkedModelSerializer): + class Meta: + model = models.WorkRequestRelation + fields = '__all__' + + + diff --git a/SAS/LSMR/src/lsmr/lsmrapp/viewsets/specification.py b/SAS/LSMR/src/lsmr/lsmrapp/viewsets/specification.py index f79772d9c52..21ff677625b 100644 --- a/SAS/LSMR/src/lsmr/lsmrapp/viewsets/specification.py +++ b/SAS/LSMR/src/lsmr/lsmrapp/viewsets/specification.py @@ -60,3 +60,12 @@ class RunViewSet(viewsets.ModelViewSet): queryset = models.Run.objects.all() serializer_class = serializers.RunSerializer + +class WorkRequestRelationBlueprintViewSet(viewsets.ModelViewSet): + queryset = models.WorkRequestRelationBlueprint.objects.all() + serializer_class = serializers.WorkRequestRelationBlueprintSerializer + + +class WorkRequestRelationViewSet(viewsets.ModelViewSet): + queryset = models.WorkRequestRelation.objects.all() + serializer_class = serializers.WorkRequestRelationSerializer diff --git a/SAS/LSMR/src/lsmr/urls.py b/SAS/LSMR/src/lsmr/urls.py index 962a15368fe..033fc7f376b 100644 --- a/SAS/LSMR/src/lsmr/urls.py +++ b/SAS/LSMR/src/lsmr/urls.py @@ -37,14 +37,20 @@ urlpatterns = [ router = routers.SimpleRouter() router.register(r'tags', viewsets.TagsViewSet) + +# templates router.register(r'generator_template', viewsets.GeneratorTemplateViewSet) router.register(r'run_template', viewsets.RunTemplateViewSet) router.register(r'work_request_template', viewsets.WorkRequestTemplateViewSet) router.register(r'work_relation_selection_template', viewsets.WorkRelationSelectionTemplateViewSet) router.register(r'work_io_roles', viewsets.WorkIORolesViewSet) + +# instances router.register(r'cycle', viewsets.CycleViewSet) router.register(r'project', viewsets.ProjectViewSet) router.register(r'run_set', viewsets.RunSetViewSet) +router.register(r'work_request_relation_blueprint', viewsets.WorkRequestRelationBlueprintViewSet) +router.register(r'work_request_relation', viewsets.WorkRequestRelationViewSet) urlpatterns.extend(router.urls) -- GitLab