Skip to content
Snippets Groups Projects
Commit d3be2873 authored by Benjamin Hättasch's avatar Benjamin Hättasch Committed by Nadja Geisler
Browse files

Move scheduling admin view urls to separate file

Additionally fix wrong app installed check for ak detail link (should be AKSubmission, not AKScheduling)
parent fb3b9971
No related branches found
No related tags found
1 merge request!99Constraint Violation checking & visualization
......@@ -117,12 +117,8 @@ class AKTrackAdmin(admin.ModelAdmin):
urls = super().get_urls()
custom_urls = []
if apps.is_installed("AKScheduling"):
from AKScheduling.views import TrackAdminView
custom_urls.extend([
path('<slug:event_slug>/manage/', self.admin_site.admin_view(TrackAdminView.as_view()),
name="tracks_manage"),
])
from AKScheduling.urls import get_admin_urls_track
custom_urls.extend(get_admin_urls_track(self.admin_site))
return custom_urls + urls
......@@ -282,14 +278,8 @@ class AKSlotAdmin(admin.ModelAdmin):
urls = super().get_urls()
custom_urls = []
if apps.is_installed("AKScheduling"):
from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView
custom_urls.extend([
path('<slug:event_slug>/schedule/', self.admin_site.admin_view(SchedulingAdminView.as_view()),
name="schedule"),
path('<slug:event_slug>/unscheduled/', self.admin_site.admin_view(UnscheduledSlotsAdminView.as_view()),
name="slots_unscheduled"),
])
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):
......@@ -307,7 +297,7 @@ class AKSlotAdmin(admin.ModelAdmin):
return super(AKSlotAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
def ak_details_link(self, akslot):
if apps.is_installed("AKScheduling") and akslot.ak is not None:
if apps.is_installed("AKSubmission") and akslot.ak is not None:
link = f"<a href={reverse('submit:ak_detail', args=[akslot.event.slug, akslot.ak.pk])}>{str(akslot.ak)}</a>"
return mark_safe(link)
return "-"
......
from django.urls import path
from AKScheduling.views import SchedulingAdminView, UnscheduledSlotsAdminView, TrackAdminView
def get_admin_urls_slot(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()),
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