From b8e64d40ff7cc4942b04c7df17893721fb43ea6b Mon Sep 17 00:00:00 2001 From: Oludare Oludare Date: Tue, 6 Jun 2017 09:48:56 -0400 Subject: [PATCH 1/3] Creating new endpoint for Source Config --- api/serializers.py | 6 ++++++ api/urls.py | 1 + api/views/__init__.py | 1 + api/views/sourceConfig.py | 10 ++++++++++ 4 files changed, 18 insertions(+) create mode 100644 api/views/sourceConfig.py diff --git a/api/serializers.py b/api/serializers.py index 1eaf5f3f0..ffd6f7570 100644 --- a/api/serializers.py +++ b/api/serializers.py @@ -139,6 +139,12 @@ class Meta: fields = ('name', 'home_page', 'long_title', 'icon') +class SourceConfigSerializer(ShareModelSerializer): + class Meta: + model = models.SourceConfig + fields = '__all__' + + class SiteBannerSerializer(ShareModelSerializer): color = serializers.SerializerMethodField() diff --git a/api/urls.py b/api/urls.py index ec60b1804..5fb0e50bc 100644 --- a/api/urls.py +++ b/api/urls.py @@ -86,6 +86,7 @@ def register_url(self, subclass, viewset): register_route(r'rawdata', views.RawDatumViewSet) register_route(r'user', views.ShareUserViewSet) register_route(r'sources', views.SourceViewSet) +register_route(r'sourceConfig', views.SourceConfigViewSet) router.register(r'normalizeddata', views.NormalizedDataViewSet, base_name='normalizeddata') diff --git a/api/views/__init__.py b/api/views/__init__.py index 68bec4096..e3653bca0 100644 --- a/api/views/__init__.py +++ b/api/views/__init__.py @@ -5,3 +5,4 @@ from .registration import * # noqa from .schema import * # noqa from .banner import * # noqa +from .sourceConfig import * # noqa diff --git a/api/views/sourceConfig.py b/api/views/sourceConfig.py new file mode 100644 index 000000000..7485a3021 --- /dev/null +++ b/api/views/sourceConfig.py @@ -0,0 +1,10 @@ +from rest_framework import viewsets + +from api.serializers import SourceConfigSerializer +from share.models import SourceConfig + +class SourceConfigViewSet(viewsets.ReadOnlyModelViewSet): + serializer_class = SourceConfigSerializer + + def get_queryset(self): + return SourceConfig.objects.all() From f5c59ce433a787b1ec8d3e21f7c9564631201bb6 Mon Sep 17 00:00:00 2001 From: Oludare Olugbemi Date: Wed, 28 Jun 2017 13:23:41 -0400 Subject: [PATCH 2/3] PR Changes --- api/urls.py | 2 +- api/views/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/urls.py b/api/urls.py index 5fb0e50bc..21ed06a85 100644 --- a/api/urls.py +++ b/api/urls.py @@ -86,7 +86,7 @@ def register_url(self, subclass, viewset): register_route(r'rawdata', views.RawDatumViewSet) register_route(r'user', views.ShareUserViewSet) register_route(r'sources', views.SourceViewSet) -register_route(r'sourceConfig', views.SourceConfigViewSet) +register_route(r'source_config', views.SourceConfigViewSet) router.register(r'normalizeddata', views.NormalizedDataViewSet, base_name='normalizeddata') diff --git a/api/views/__init__.py b/api/views/__init__.py index e3653bca0..634d7ec46 100644 --- a/api/views/__init__.py +++ b/api/views/__init__.py @@ -5,4 +5,4 @@ from .registration import * # noqa from .schema import * # noqa from .banner import * # noqa -from .sourceConfig import * # noqa +from .source_config import * # noqa From ee6e8935c68c693abd0047e7baf430e0605628c3 Mon Sep 17 00:00:00 2001 From: Oludare Olugbemi Date: Wed, 28 Jun 2017 13:33:10 -0400 Subject: [PATCH 3/3] PR Changes --- api/views/{sourceConfig.py => source_config.py} | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) rename api/views/{sourceConfig.py => source_config.py} (76%) diff --git a/api/views/sourceConfig.py b/api/views/source_config.py similarity index 76% rename from api/views/sourceConfig.py rename to api/views/source_config.py index 7485a3021..515bbc627 100644 --- a/api/views/sourceConfig.py +++ b/api/views/source_config.py @@ -5,6 +5,4 @@ class SourceConfigViewSet(viewsets.ReadOnlyModelViewSet): serializer_class = SourceConfigSerializer - - def get_queryset(self): - return SourceConfig.objects.all() + queryset = SourceConfig.objects.all()