Naming tweaks

This commit is contained in:
Jeremy Stretch 2020-04-02 15:43:23 -04:00
parent ee4c5ef64a
commit 9e0aa0d11e

View File

@ -18,14 +18,14 @@ plugin_admin_patterns = [
] ]
# Register base/API URL patterns for each plugin # Register base/API URL patterns for each plugin
for plugin in settings.PLUGINS: for plugin_path in settings.PLUGINS:
plugin_name = plugin.split('.')[-1] plugin_name = plugin_path.split('.')[-1]
app = apps.get_app_config(plugin_name) app = apps.get_app_config(plugin_name)
base_url = getattr(app, 'base_url') or app.label base_url = getattr(app, 'base_url') or app.label
# Check if the plugin specifies any base URLs # Check if the plugin specifies any base URLs
try: try:
urlpatterns = import_string(f"{plugin}.urls.urlpatterns") urlpatterns = import_string(f"{plugin_path}.urls.urlpatterns")
plugin_patterns.append( plugin_patterns.append(
path(f"{base_url}/", include((urlpatterns, app.label))) path(f"{base_url}/", include((urlpatterns, app.label)))
) )
@ -34,7 +34,7 @@ for plugin in settings.PLUGINS:
# Check if the plugin specifies any API URLs # Check if the plugin specifies any API URLs
try: try:
urlpatterns = import_string(f"{plugin}.api.urls.urlpatterns") urlpatterns = import_string(f"{plugin_path}.api.urls.urlpatterns")
plugin_api_patterns.append( plugin_api_patterns.append(
path(f"{base_url}/", include((urlpatterns, f"{app.label}-api"))) path(f"{base_url}/", include((urlpatterns, f"{app.label}-api")))
) )