Skip to content
Snippets Groups Projects
Commit 31c2fe19 authored by Nadja Geisler's avatar Nadja Geisler :sunny:
Browse files

Merge branch 'fix-admin-access' into 'main'

Add further view tests for admin interface and fix access control issues detected by this

See merge request !157
parents 6789d0c7 e1ef6860
No related branches found
No related tags found
1 merge request!157Add further view tests for admin interface and fix access control issues detected by this
Pipeline #129162 passed
...@@ -53,10 +53,10 @@ class EventAdmin(admin.ModelAdmin): ...@@ -53,10 +53,10 @@ class EventAdmin(admin.ModelAdmin):
from AKScheduling.urls import get_admin_urls_scheduling from AKScheduling.urls import get_admin_urls_scheduling
urls.extend(get_admin_urls_scheduling(self.admin_site)) urls.extend(get_admin_urls_scheduling(self.admin_site))
urls.extend([ urls.extend([
path('plan/publish/', PlanPublishView.as_view(), name="plan-publish"), path('plan/publish/', self.admin_site.admin_view(PlanPublishView.as_view()), name="plan-publish"),
path('plan/unpublish/', PlanUnpublishView.as_view(), name="plan-unpublish"), path('plan/unpublish/', self.admin_site.admin_view(PlanUnpublishView.as_view()), name="plan-unpublish"),
path('<slug:event_slug>/defaultSlots/', DefaultSlotEditorView.as_view(), name="default-slots-editor"), path('<slug:event_slug>/defaultSlots/', self.admin_site.admin_view(DefaultSlotEditorView.as_view()), name="default-slots-editor"),
path('<slug:event_slug>/importRooms/', RoomBatchCreationView.as_view(), name="room-import"), path('<slug:event_slug>/importRooms/', self.admin_site.admin_view(RoomBatchCreationView.as_view()), name="room-import"),
]) ])
urls.extend(super().get_urls()) urls.extend(super().get_urls())
return urls return urls
......
...@@ -99,7 +99,16 @@ class ModelViewTests(BasicViewTests, TestCase): ...@@ -99,7 +99,16 @@ class ModelViewTests(BasicViewTests, TestCase):
] ]
VIEWS_STAFF_ONLY = [ VIEWS_STAFF_ONLY = [
('admin:index', {}) ('admin:index', {}),
('admin:event_status', {'slug': 'kif42'}),
('admin:event_requirement_overview', {'event_slug': 'kif42'}),
('admin:ak_csv_export', {'event_slug': 'kif42'}),
('admin:ak_wiki_export', {'slug': 'kif42'}),
('admin:ak_delete_orga_messages', {'event_slug': 'kif42'}),
('admin:ak_slide_export', {'event_slug': 'kif42'}),
('admin:default-slots-editor', {'event_slug': 'kif42'}),
('admin:room-import', {'event_slug': 'kif42'}),
('admin:new_event_wizard_start', {}),
] ]
def test_admin(self): def test_admin(self):
......
...@@ -83,5 +83,5 @@ def get_admin_urls_event(admin_site): ...@@ -83,5 +83,5 @@ def get_admin_urls_event(admin_site):
name="ak_wiki_export"), name="ak_wiki_export"),
path('<slug:event_slug>/delete-orga-messages/', admin_site.admin_view(AKMessageDeleteView.as_view()), path('<slug:event_slug>/delete-orga-messages/', admin_site.admin_view(AKMessageDeleteView.as_view()),
name="ak_delete_orga_messages"), name="ak_delete_orga_messages"),
path('<slug:event_slug>/ak-slide-export/', ExportSlidesView.as_view(), name="ak_slide_export"), path('<slug:event_slug>/ak-slide-export/', admin_site.admin_view(ExportSlidesView.as_view()), name="ak_slide_export"),
] ]
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