From 53e082de069580d450c2b099f117da933e110742 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Wed, 16 Mar 2022 12:07:59 +0100 Subject: [PATCH] Move govplan admin to different namespace --- froide_govplan/admin.py | 3 ++- froide_govplan/cms_toolbars.py | 8 ++++---- froide_govplan/urls.py | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/froide_govplan/admin.py b/froide_govplan/admin.py index a868dc9..37efa8d 100644 --- a/froide_govplan/admin.py +++ b/froide_govplan/admin.py @@ -22,6 +22,7 @@ User = auth.get_user_model() class GovPlanAdminSite(admin.AdminSite): site_header = "Regierungsvorhaben" + site_url = "/koalitionstracker/" class GovernmentPlanAdminForm(GovernmentPlanForm): @@ -280,6 +281,6 @@ admin.site.register(GovernmentPlan, GovernmentPlanAdmin) admin.site.register(GovernmentPlanUpdate, GovernmentPlanUpdateAdmin) admin.site.register(GovernmentPlanSection, GovernmentPlanSectionAdmin) -govplan_admin_site = GovPlanAdminSite(name="govplan") +govplan_admin_site = GovPlanAdminSite(name="govplanadmin") govplan_admin_site.register(GovernmentPlan, GovernmentPlanAdmin) govplan_admin_site.register(GovernmentPlanUpdate, GovernmentPlanUpdateAdmin) diff --git a/froide_govplan/cms_toolbars.py b/froide_govplan/cms_toolbars.py index 3b5f86c..d567bb9 100644 --- a/froide_govplan/cms_toolbars.py +++ b/froide_govplan/cms_toolbars.py @@ -13,14 +13,14 @@ class GovPlanToolbar(CMSToolbar): menu = self.toolbar.get_or_create_menu("govplan-menu", _("GovPlan")) govplan = self.request.govplan url = reverse( - "govplan:admin:froide_govplan_governmentplan_change", + "admin:froide_govplan_governmentplan_change", args=(govplan.pk,), - current_app="govplan", + current_app="govplanadmin", ) menu.add_modal_item(_("Edit government plan"), url=url) url = reverse( - "govplan:admin:froide_govplan_governmentplanupdate_add", - current_app="govplan", + "admin:froide_govplan_governmentplanupdate_add", + current_app="govplanadmin", ) menu.add_modal_item(_("Add update"), url=url) diff --git a/froide_govplan/urls.py b/froide_govplan/urls.py index 7efaaef..76d6ae0 100644 --- a/froide_govplan/urls.py +++ b/froide_govplan/urls.py @@ -1,7 +1,6 @@ from django.urls import path from django.utils.translation import pgettext_lazy -from .admin import govplan_admin_site from .views import ( GovPlanDetailOGView, GovPlanDetailView, @@ -12,7 +11,6 @@ from .views import ( app_name = "govplan" urlpatterns = [ - path("admin/", govplan_admin_site.urls), path("search/", search, name="search"), path( pgettext_lazy("url part", "/plan//"),