From 1dd2717ff25e8ea761d4edc993f4d987b584a0f1 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Thu, 19 Sep 2024 20:47:52 +0200 Subject: [PATCH] Move api router registration to app ready --- froide_govplan/admin.py | 10 ++-------- froide_govplan/apps.py | 6 ++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/froide_govplan/admin.py b/froide_govplan/admin.py index 0a00a53..36dd892 100644 --- a/froide_govplan/admin.py +++ b/froide_govplan/admin.py @@ -1,20 +1,16 @@ +from adminsortable2.admin import SortableAdminMixin +from cms.admin.placeholderadmin import PlaceholderAdminMixin from django.contrib import admin, auth from django.contrib.auth.models import Group from django.shortcuts import get_object_or_404, redirect, render from django.urls import path, reverse, reverse_lazy from django.utils.translation import gettext_lazy as _ - -from adminsortable2.admin import SortableAdminMixin -from cms.admin.placeholderadmin import PlaceholderAdminMixin - -from froide.api import api_router from froide.follow.admin import FollowerAdmin from froide.helper.admin_utils import make_choose_object_action, make_emptyfilter 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 ( GovernmentPlanForm, @@ -31,8 +27,6 @@ from .models import ( User = auth.get_user_model() -api_router.register(r"governmentplan", GovernmentPlanViewSet, basename="governmentplan") - class GovPlanAdminSite(admin.AdminSite): site_header = conf.GOVPLAN_NAME diff --git a/froide_govplan/apps.py b/froide_govplan/apps.py index 680e907..93dbf54 100644 --- a/froide_govplan/apps.py +++ b/froide_govplan/apps.py @@ -7,8 +7,14 @@ class FroideGovPlanConfig(AppConfig): verbose_name = _("GovPlan App") def ready(self): + from froide.api import api_router from froide.follow.configuration import follow_registry + from .api_views import GovernmentPlanViewSet from .configuration import GovernmentPlanFollowConfiguration follow_registry.register(GovernmentPlanFollowConfiguration()) + + api_router.register( + r"governmentplan", GovernmentPlanViewSet, basename="governmentplan" + )