Skip to content
Snippets Groups Projects
Commit 0a2794b5 authored by Benjamin Hättasch's avatar Benjamin Hättasch
Browse files

Unify scheduling admin url structure (now all admin/AKModel/event/slug/action)

parent 806415d0
No related branches found
No related tags found
No related merge requests found
...@@ -35,6 +35,9 @@ class EventAdmin(admin.ModelAdmin): ...@@ -35,6 +35,9 @@ class EventAdmin(admin.ModelAdmin):
def get_urls(self): def get_urls(self):
urls = get_admin_urls_event_wizard(self.admin_site) urls = get_admin_urls_event_wizard(self.admin_site)
urls.extend(get_admin_urls_event(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()) urls.extend(super().get_urls())
return urls return urls
...@@ -90,14 +93,6 @@ class AKTrackAdmin(admin.ModelAdmin): ...@@ -90,14 +93,6 @@ class AKTrackAdmin(admin.ModelAdmin):
kwargs['initial'] = Event.get_next_active() kwargs['initial'] = Event.get_next_active()
return super(AKTrackAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs) 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) @admin.register(AKTag)
class AKTagAdmin(admin.ModelAdmin): class AKTagAdmin(admin.ModelAdmin):
...@@ -251,14 +246,6 @@ class AKSlotAdmin(admin.ModelAdmin): ...@@ -251,14 +246,6 @@ class AKSlotAdmin(admin.ModelAdmin):
readonly_fields = ['ak_details_link', 'updated'] readonly_fields = ['ak_details_link', 'updated']
form = AKSlotAdminForm 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): def get_form(self, request, obj=None, change=False, **kwargs):
# Use timezone of associated event # Use timezone of associated event
if obj is not None and obj.event.timezone: if obj is not None and obj.event.timezone:
......
...@@ -3,17 +3,12 @@ from django.urls import path ...@@ -3,17 +3,12 @@ from django.urls import path
from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView, TrackAdminView from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView, TrackAdminView
def get_admin_urls_slot(admin_site): def get_admin_urls_scheduling(admin_site):
return [ return [
path('<slug:event_slug>/schedule/', admin_site.admin_view(SchedulingAdminView.as_view()), path('<slug:event_slug>/schedule/', admin_site.admin_view(SchedulingAdminView.as_view()),
name="schedule"), name="schedule"),
path('<slug:event_slug>/unscheduled/', admin_site.admin_view(UnscheduledSlotsAdminView.as_view()), path('<slug:event_slug>/unscheduled/', admin_site.admin_view(UnscheduledSlotsAdminView.as_view()),
name="slots_unscheduled"), name="slots_unscheduled"),
] path('<slug:event_slug>/tracks/', admin_site.admin_view(TrackAdminView.as_view()),
def get_admin_urls_track(admin_site):
return [
path('<slug:event_slug>/manage/', admin_site.admin_view(TrackAdminView.as_view()),
name="tracks_manage"), name="tracks_manage"),
] ]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment