From c3fcaa9db364dc0672a7d713a1abd1804e543a0b Mon Sep 17 00:00:00 2001
From: Ernesto Rico Schmidt <ernesto@helsinki.at>
Date: Fri, 20 Nov 2020 15:11:04 -0400
Subject: [PATCH] Remove deprecated urls and clean-up code
---
pv/urls.py | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/pv/urls.py b/pv/urls.py
index b6b28c82..c22d2ccb 100644
--- a/pv/urls.py
+++ b/pv/urls.py
@@ -1,12 +1,12 @@
-# -*- coding: utf-8 -*-
-
from django.conf import settings
from django.conf.urls import url, include
from django.contrib import admin
from django.views.static import serve
from rest_framework_nested import routers
-from program.views import APIUserViewSet, APIHostViewSet, APIShowViewSet, APIScheduleViewSet, APITimeSlotViewSet, APINoteViewSet, APICategoryViewSet, APITypeViewSet, APITopicViewSet, APIMusicFocusViewSet, APIFundingCategoryViewSet, APILanguageViewSet, json_day_schedule, json_playout, json_timeslots_specials
+from program.views import APIUserViewSet, APIHostViewSet, APIShowViewSet, APIScheduleViewSet, APITimeSlotViewSet, \
+ APINoteViewSet, APICategoryViewSet, APITypeViewSet, APITopicViewSet, APIMusicFocusViewSet, APIFundingCategoryViewSet, \
+ APILanguageViewSet, json_day_schedule, json_playout
admin.autodiscover()
@@ -24,8 +24,7 @@ router.register(r'musicfocus', APIMusicFocusViewSet)
router.register(r'fundingcategories', APIFundingCategoryViewSet)
router.register(r'languages', APILanguageViewSet)
-
-'''Nested Routers'''
+# Nested Routers
show_router = routers.NestedSimpleRouter(router, r'shows', lookup='show')
@@ -52,10 +51,9 @@ timeslot_router = routers.NestedSimpleRouter(schedule_router, r'timeslots', look
# /shows/1/schedules/1/timeslots/1/note
timeslot_router.register(r'note', APINoteViewSet, basename='timeslots-note')
-
urlpatterns = [
url(r'^openid/', include('oidc_provider.urls', namespace='oidc_provider')),
- url(r'^api/v1/', include(router.urls) ),
+ url(r'^api/v1/', include(router.urls)),
url(r'^api/v1/', include(show_router.urls)),
url(r'^api/v1/', include(show_timeslot_router.urls)),
url(r'^api/v1/', include(schedule_router.urls)),
@@ -66,8 +64,7 @@ urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'^program/', include('program.urls')),
url(r'^api/', include('frapp.urls')),
- #url(r'^tinymce/', include('tinymce.urls')),
- url(r'^export/timeslots_specials.json$', json_timeslots_specials), # Deprecated
+ # url(r'^tinymce/', include('tinymce.urls')),
]
if settings.DEBUG:
--
GitLab