diff --git a/api/serializers.py b/api/serializers.py index 419b4e4..1f5c074 100644 --- a/api/serializers.py +++ b/api/serializers.py @@ -9,12 +9,16 @@ class PlaybookSerializer(serializers.ModelSerializer): class FileSerializer(serializers.ModelSerializer): + playbook = PlaybookSerializer(source='playbook_id', read_only=True) + class Meta: model = models.File fields = '__all__' class RecordSerializer(serializers.ModelSerializer): + playbook = PlaybookSerializer(source='playbook_id', read_only=True) + class Meta: model = models.Record fields = '__all__' diff --git a/api/urls.py b/api/urls.py index 271b812..c6ca7ca 100644 --- a/api/urls.py +++ b/api/urls.py @@ -1,6 +1,5 @@ from django.conf.urls import url, include from rest_framework.routers import DefaultRouter -from rest_framework_nested import routers as NestedRouter from api import views @@ -9,11 +8,6 @@ router.register(r'playbooks', views.PlaybookViewSet, base_name='playbooks') router.register(r'records', views.RecordViewSet, base_name='records') router.register(r'files', views.FileViewSet, base_name='files') -nested_router = NestedRouter.NestedSimpleRouter(router, r'playbooks', lookup='playbooks') -nested_router.register(r'records', views.RecordViewSet, base_name='playbook-records') -nested_router.register(r'files', views.FileViewSet, base_name='playbook-files') - urlpatterns = [ url(r'^', include(router.urls)), - url(r'^', include(nested_router.urls)), ] diff --git a/ara/settings.py b/ara/settings.py index 42267e4..28669ed 100644 --- a/ara/settings.py +++ b/ara/settings.py @@ -29,14 +29,12 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'rest_framework', - 'corsheaders', 'api' ] MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', - 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', diff --git a/ara/urls.py b/ara/urls.py index 58b2049..13efa84 100644 --- a/ara/urls.py +++ b/ara/urls.py @@ -6,7 +6,8 @@ from django.conf.urls.static import static admin.site.site_header = 'Administration' admin.site.index_title = 'Administration Ara' -urlpatterns = [ - url(r'^api/v1/', include('api.urls')), - url(r'^admin/', admin.site.urls), - ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) +routes = [ + url(r'^api/v1/', include('api.urls')), + url(r'^admin/', admin.site.urls), +] +urlpatterns = routes + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/requirements.txt b/requirements.txt index c13b8d3..8eafddb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ Django<2 -django-cors-middleware djangorestframework -drf-nested-routers envparse