Skip to content

Commit 54951c9

Browse files
committed
refactor: [#2081] sort project applications in INSTALLED_APPS alphabetically
1 parent 7b5998b commit 54951c9

File tree

15 files changed

+25
-25
lines changed

15 files changed

+25
-25
lines changed

src/open_inwoner/conf/base.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,12 @@
214214
"custom_migrations",
215215
"objectsapiclient",
216216
*default_health_check_apps,
217-
# Project applications.
218-
"open_inwoner.core",
217+
# Project applications - sorted alphabetically
218+
"open_inwoner._legacy.cms.plugins", # Legacy - migrations only
219+
"open_inwoner.accounts.cms.mijn_profiel",
219220
"open_inwoner.components",
221+
"open_inwoner.configurations",
222+
"open_inwoner.core",
220223
"open_inwoner.core.cms.cms_plugins.banner",
221224
"open_inwoner.core.cms.cms_plugins.extensions",
222225
"open_inwoner.core.cms.cms_plugins.footer",
@@ -229,27 +232,24 @@
229232
"open_inwoner.haalcentraal",
230233
"open_inwoner.kvk",
231234
"open_inwoner.laposta",
232-
"open_inwoner.qmatic",
233-
"open_inwoner.search",
234-
"open_inwoner.utils",
235-
"open_inwoner.configurations",
236-
"open_inwoner.openklant",
237-
"open_inwoner.soap",
238-
"open_inwoner.questionnaire",
239235
"open_inwoner.mail",
240236
"open_inwoner.media",
241-
"open_inwoner.userfeed",
237+
"open_inwoner.mijn_aanvragen.cms.apps.MijnAanvragenCmsConfig",
242238
"open_inwoner.mijn_afval",
243239
"open_inwoner.mijn_afval.cms",
244-
"open_inwoner.mijn_uitkeringen",
245240
"open_inwoner.mijn_samenwerkingen",
241+
"open_inwoner.mijn_uitkeringen",
246242
"open_inwoner.onderwerpen",
247-
"open_inwoner.accounts.cms.mijn_profiel",
248-
"open_inwoner.mijn_aanvragen.cms.apps.MijnAanvragenCmsConfig",
249-
"open_inwoner._legacy.cms.plugins", # Legacy - migrations only
250-
"djchoices",
243+
"open_inwoner.openklant",
244+
"open_inwoner.qmatic",
245+
"open_inwoner.questionnaire",
246+
"open_inwoner.search",
247+
"open_inwoner.soap",
248+
"open_inwoner.userfeed",
249+
"open_inwoner.utils",
251250
"django_celery_beat",
252251
"django_celery_monitor",
252+
"djchoices",
253253
# Temporary fix: the notifications lib interferes with
254254
# celery's task loading meachanism, which prevents certain
255255
# tasks from showing up in the admin when OIP is run with

src/open_inwoner/core/cms/cms_plugins/footer/cms_plugins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def render(self, context, instance, placeholder):
3535
cms_pages.remove(page)
3636

3737
contact_form_pages = Page.objects.filter(
38-
template="cms/contactform/form_outer.html", publisher_is_draft=False
38+
template="openklant/contactform/form_outer.html", publisher_is_draft=False
3939
)
4040

4141
# Use the first page if it exists

src/open_inwoner/core/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def _get_footer_pages(is_authenticated: bool) -> list:
151151

152152
# Add contact form page at the beginning if enabled
153153
contact_form_pages = Page.objects.filter(
154-
template="cms/contactform/form_outer.html", publisher_is_draft=False
154+
template="openklant/contactform/form_outer.html", publisher_is_draft=False
155155
)
156156
if contact_form_pages.exists() and klant_config.contact_registration_enabled:
157157
cms_footer_pages.insert(0, contact_form_pages.first())

src/open_inwoner/mijn_samenwerkingen/cms/cms_plugins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class ActivePlansPlugin(CMSActiveAppMixin, CMSPluginBase):
1212
module = _("Collaborate")
1313
name = _("Active Plans Plugin")
14-
render_template = "mijn_samenwerkingen/active_plans_plugin.html"
14+
render_template = "mijn_samenwerkingen_cms/active_plans_plugin.html"
1515
cache = False
1616
disable_child_plugins = True
1717
app_hook = "CollaborateApphook"

src/open_inwoner/mijn_samenwerkingen/cms/templates/mijn_samenwerkingen/active_plans_plugin.html renamed to src/open_inwoner/mijn_samenwerkingen/templates/mijn_samenwerkingen_cms/active_plans_plugin.html

File renamed without changes.

src/open_inwoner/onderwerpen/cms/cms_plugins.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def has_menu_items(context):
4646
class CategoriesPlugin(CMSActiveAppMixin, CMSPluginBase):
4747
module = _("PDC")
4848
name = _("Categories Plugin")
49-
render_template = "onderwerpen/categories_plugin.html"
49+
render_template = "onderwerpen_cms/categories_plugin.html"
5050
app_hook = "ProductsApphook"
5151
cache = False
5252
limit = 3 # Limit to 3 categories for Home page
@@ -92,7 +92,7 @@ def render(self, context, instance, placeholder):
9292
class QuestionnairePlugin(CMSActiveAppMixin, CMSPluginBase):
9393
module = _("PDC")
9494
name = _("Questionnaire Plugin")
95-
render_template = "onderwerpen/questionnaire_plugin.html"
95+
render_template = "onderwerpen_cms/questionnaire_plugin.html"
9696
app_hook = "ProductsApphook"
9797
cache = False
9898

@@ -107,7 +107,7 @@ def render(self, context, instance, placeholder):
107107
class ProductFinderPlugin(CMSActiveAppMixin, CMSPluginBase):
108108
module = _("PDC")
109109
name = _("Product Finder Plugin")
110-
render_template = "onderwerpen/product_finder_plugin.html"
110+
render_template = "onderwerpen_cms/product_finder_plugin.html"
111111
app_hook = "ProductsApphook"
112112
cache = False
113113

@@ -121,7 +121,7 @@ def render(self, context, instance, placeholder):
121121
class ProductLocationPlugin(CMSActiveAppMixin, CMSPluginBase):
122122
module = _("PDC")
123123
name = _("Product Location Plugin")
124-
render_template = "onderwerpen/product_location_plugin.html"
124+
render_template = "onderwerpen_cms/product_location_plugin.html"
125125
app_hook = "ProductsApphook"
126126
cache = False
127127

src/open_inwoner/onderwerpen/cms/templates/onderwerpen/categories_plugin.html renamed to src/open_inwoner/onderwerpen/templates/onderwerpen_cms/categories_plugin.html

File renamed without changes.

src/open_inwoner/onderwerpen/cms/templates/onderwerpen/product_finder_plugin.html renamed to src/open_inwoner/onderwerpen/templates/onderwerpen_cms/product_finder_plugin.html

File renamed without changes.

src/open_inwoner/onderwerpen/cms/templates/onderwerpen/product_location_plugin.html renamed to src/open_inwoner/onderwerpen/templates/onderwerpen_cms/product_location_plugin.html

File renamed without changes.

src/open_inwoner/onderwerpen/cms/templates/onderwerpen/questionnaire_plugin.html renamed to src/open_inwoner/onderwerpen/templates/onderwerpen_cms/questionnaire_plugin.html

File renamed without changes.

0 commit comments

Comments
 (0)