diff --git a/AKModel/admin.py b/AKModel/admin.py index 2d832ad375a0ff7448b8227da46c1edf4f9270b2..4a28ed703c12660c93cfa203141268e0bd17c550 100644 --- a/AKModel/admin.py +++ b/AKModel/admin.py @@ -35,6 +35,9 @@ class EventAdmin(admin.ModelAdmin): def get_urls(self): urls = get_admin_urls_event_wizard(self.admin_site) urls.extend(get_admin_urls_event(self.admin_site)) + if apps.is_installed("AKScheduling"): + from AKScheduling.urls import get_admin_urls_scheduling + urls.extend(get_admin_urls_scheduling(self.admin_site)) urls.extend(super().get_urls()) return urls @@ -90,14 +93,6 @@ class AKTrackAdmin(admin.ModelAdmin): kwargs['initial'] = Event.get_next_active() return super(AKTrackAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) - def get_urls(self): - urls = super().get_urls() - custom_urls = [] - if apps.is_installed("AKScheduling"): - from AKScheduling.urls import get_admin_urls_track - custom_urls.extend(get_admin_urls_track(self.admin_site)) - return custom_urls + urls - @admin.register(AKTag) class AKTagAdmin(admin.ModelAdmin): @@ -251,14 +246,6 @@ class AKSlotAdmin(admin.ModelAdmin): readonly_fields = ['ak_details_link', 'updated'] form = AKSlotAdminForm - def get_urls(self): - urls = super().get_urls() - custom_urls = [] - if apps.is_installed("AKScheduling"): - from AKScheduling.urls import get_admin_urls_slot - custom_urls.extend(get_admin_urls_slot(self.admin_site)) - return custom_urls + urls - def get_form(self, request, obj=None, change=False, **kwargs): # Use timezone of associated event if obj is not None and obj.event.timezone: diff --git a/AKScheduling/urls.py b/AKScheduling/urls.py index 4fb483a1b67e9c214fc2019cf7f47327f8802d77..171f3a1abdad4980f617fbbaab5781c516292fb1 100644 --- a/AKScheduling/urls.py +++ b/AKScheduling/urls.py @@ -3,17 +3,12 @@ from django.urls import path from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView, TrackAdminView -def get_admin_urls_slot(admin_site): +def get_admin_urls_scheduling(admin_site): return [ path('<slug:event_slug>/schedule/', admin_site.admin_view(SchedulingAdminView.as_view()), name="schedule"), path('<slug:event_slug>/unscheduled/', admin_site.admin_view(UnscheduledSlotsAdminView.as_view()), name="slots_unscheduled"), - ] - - -def get_admin_urls_track(admin_site): - return [ - path('<slug:event_slug>/manage/', admin_site.admin_view(TrackAdminView.as_view()), + path('<slug:event_slug>/tracks/', admin_site.admin_view(TrackAdminView.as_view()), name="tracks_manage"), ]