From 25217596257b7acbf70651e884b0bcfab33107b4 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Fri, 3 Feb 2023 15:26:20 +0100 Subject: [PATCH] Add conf file to configure project name --- froide_govplan/admin.py | 5 +++-- froide_govplan/cms_toolbars.py | 4 +++- froide_govplan/conf.py | 4 ++++ froide_govplan/models.py | 5 +++-- froide_govplan/utils.py | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 froide_govplan/conf.py diff --git a/froide_govplan/admin.py b/froide_govplan/admin.py index cf8d573..cb4c923 100644 --- a/froide_govplan/admin.py +++ b/froide_govplan/admin.py @@ -12,6 +12,7 @@ from froide.helper.admin_utils import make_choose_object_action, make_emptyfilte from froide.helper.widgets import TagAutocompleteWidget from froide.organization.models import Organization +from . import conf from .api_views import GovernmentPlanViewSet from .auth import get_allowed_plans, has_limited_access from .forms import ( @@ -33,8 +34,8 @@ api_router.register(r"governmentplan", GovernmentPlanViewSet, basename="governme class GovPlanAdminSite(admin.AdminSite): - site_header = "Regierungsvorhaben" - site_url = "/koalitionstracker/" + site_header = conf.GOVPLAN_NAME + site_url = None class GovernmentPlanAdminForm(GovernmentPlanForm): diff --git a/froide_govplan/cms_toolbars.py b/froide_govplan/cms_toolbars.py index bb64b29..b24a09f 100644 --- a/froide_govplan/cms_toolbars.py +++ b/froide_govplan/cms_toolbars.py @@ -4,6 +4,8 @@ from django.utils.translation import gettext_lazy as _ from cms.toolbar_base import CMSToolbar from cms.toolbar_pool import toolbar_pool +from . import conf + class GovPlanToolbar(CMSToolbar): def populate(self): @@ -12,7 +14,7 @@ class GovPlanToolbar(CMSToolbar): and self.request.current_page.application_namespace != "govplan" ): return - menu = self.toolbar.get_or_create_menu("govplan-menu", "Koalitionstracker") + menu = self.toolbar.get_or_create_menu("govplan-menu", conf.GOVPLAN_NAME) url = reverse( "admin:app_list", diff --git a/froide_govplan/conf.py b/froide_govplan/conf.py new file mode 100644 index 0000000..a0b2d9f --- /dev/null +++ b/froide_govplan/conf.py @@ -0,0 +1,4 @@ +from django.conf import settings + +GOVPLAN_ENABLE_FOIREQUEST = getattr(settings, "GOVPLAN_ENABLE_FOIREQUEST", True) +GOVPLAN_NAME = getattr(settings, "GOVPLAN_NAME", "GovPlan") diff --git a/froide_govplan/models.py b/froide_govplan/models.py index c8ffe5b..4f8522b 100644 --- a/froide_govplan/models.py +++ b/froide_govplan/models.py @@ -21,7 +21,8 @@ from froide.georegion.models import GeoRegion from froide.organization.models import Organization from froide.publicbody.models import Category, Jurisdiction, PublicBody -from .utils import TAG_NAME, make_request_url +from . import conf +from .utils import make_request_url try: from cms.models.fields import PlaceholderField @@ -317,7 +318,7 @@ class GovernmentPlan(models.Model): visibility=FoiRequest.VISIBILITY.VISIBLE_TO_PUBLIC, public_body=self.responsible_publicbody, ) - .filter(tags__name=TAG_NAME) + .filter(tags__name=conf.GOVPLAN_NAME) .filter(reference=self.get_foirequest_reference()) .order_by("-created_at") ) diff --git a/froide_govplan/utils.py b/froide_govplan/utils.py index 9826165..acd5e22 100644 --- a/froide_govplan/utils.py +++ b/froide_govplan/utils.py @@ -3,7 +3,7 @@ from urllib.parse import quote, urlencode from django.conf import settings from django.urls import reverse -TAG_NAME = "Koalitionstracker" +from . import conf def make_request_url(plan, publicbody): @@ -19,7 +19,7 @@ def make_request_url(plan, publicbody): "subject": subject.encode("utf-8"), "body": body, "ref": plan.get_foirequest_reference(), - "tags": TAG_NAME, + "tags": conf.GOVPLAN_NAME, } hide_features = ["hide_public", "hide_similar", "hide_draft"]