From b7201f9f1e18d5a7f872f0952424f5a23fec0bf5 Mon Sep 17 00:00:00 2001 From: Ross Date: Wed, 28 Apr 2021 16:53:13 +0100 Subject: [PATCH] . --- generic/urls.py | 15 --------------- rad/urls.py | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/generic/urls.py b/generic/urls.py index 0268c2b1..ffb845e3 100755 --- a/generic/urls.py +++ b/generic/urls.py @@ -1,18 +1,6 @@ from django.urls import path, include from . import views -from rapids import views as rapid_views -from anatomy import views as anatomy_views -from longs import views as long_views - -from rest_framework import routers - -router = routers.DefaultRouter() -router.register(r'rapids/exams', rapid_views.ExamViewSet, basename="rapid-exams") -router.register(r'anatomy/exams', anatomy_views.ExamViewSet, basename="anatomy-exams") -router.register(r'longs/exams', long_views.ExamViewSet, basename="long-exams") -router.register(r'rapids/answers', rapid_views.QuestionAnswerViewSet, basename="rapid-question-answers") -router.register(r'rapids/questions', rapid_views.RapidViewSet, basename="rapid-detail") app_name = "generic" @@ -28,7 +16,4 @@ urlpatterns = [ views.generic_exam_json_edit, name="generic_exam_json_edit"), - - path('api/', include(router.urls)), - path('api-auth/', include('rest_framework.urls')) ] diff --git a/rad/urls.py b/rad/urls.py index 981dfabb..6f6a6196 100644 --- a/rad/urls.py +++ b/rad/urls.py @@ -22,6 +22,20 @@ from django.views.generic import TemplateView from . import views + +from rapids import views as rapid_views +from anatomy import views as anatomy_views +from longs import views as long_views + +from rest_framework import routers + +router = routers.DefaultRouter() +router.register(r'rapids/exams', rapid_views.ExamViewSet, basename="rapid-exams") +router.register(r'anatomy/exams', anatomy_views.ExamViewSet, basename="anatomy-exams") +router.register(r'longs/exams', long_views.ExamViewSet, basename="long-exams") +router.register(r'rapids/answers', rapid_views.QuestionAnswerViewSet, basename="rapid-question-answers") +router.register(r'rapids/questions', rapid_views.RapidViewSet, basename="rapid-detail") + urlpatterns = [ path("admin/", admin.site.urls, name="admin"), path("anatomy/", include("anatomy.urls"), name="anatomy"), @@ -41,6 +55,9 @@ urlpatterns = [ path("exam/submit", views.exam_submit, name="global_exam_answers_submit"), #path('', include('generic.urls')), + + path('api/', include(router.urls)), + path('api-auth/', include('rest_framework.urls')) ] urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)