Remove DRF nested router and make api flat

Change-Id: Ib71519b9fab19d58b23467b811bc7aa482c1455b
This commit is contained in:
Guillaume Vincent 2018-02-27 13:56:12 +01:00 committed by David Moreau Simard
parent 42b04c5674
commit 3d42296683
No known key found for this signature in database
GPG Key ID: 33A07694CBB71ECC
5 changed files with 9 additions and 14 deletions

View File

@ -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__'

View File

@ -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)),
]

View File

@ -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',

View File

@ -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)

View File

@ -1,5 +1,3 @@
Django<2
django-cors-middleware
djangorestframework
drf-nested-routers
envparse