From 4834d68385841a18cc9e288e2e32ffed3115129c Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sat, 6 Apr 2019 14:12:18 +0200 Subject: [PATCH 05/10] plugins: add connector slug to view kwargs to get uniformity of kwargs in views (#31595) It means any plugin view can get its connector slug from self.kwargs['connector']. --- passerelle/plugins.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/passerelle/plugins.py b/passerelle/plugins.py index 00f7084d..491805c4 100644 --- a/passerelle/plugins.py +++ b/passerelle/plugins.py @@ -37,17 +37,19 @@ def register_apps_urls(urlpatterns): if urls: after_urls.append(url('^', include(urls))) elif hasattr(app, 'get_urls'): - url_prefix = '^%s/' % app.get_connector_model().get_connector_slug() + connector_slug = app.get_connector_model().get_connector_slug() + url_prefix = '^%s/' % connector_slug urls = app.get_urls() if urls: urls = required(app_enabled(app.label), urls) - after_urls.append(url(url_prefix, include(urls))) + after_urls.append(url(url_prefix, include(urls), kwargs={'connector': connector_slug})) if hasattr(app, 'get_management_urls'): - url_prefix = '^manage/%s/' % app.get_connector_model().get_connector_slug() + connector_slug = app.get_connector_model().get_connector_slug() + url_prefix = '^manage/%s/' % connector_slug urls = app.get_management_urls() if urls: urls = required(app_enabled(app.label), urls) urls = required(manager_required, urls) - after_urls.append(url(url_prefix, include(urls))) + after_urls.append(url(url_prefix, include(urls), kwargs={'connector': connector_slug})) return before_urls + urlpatterns + after_urls -- 2.20.1