diff --git a/dav_auth/__init__.py b/dav_auth/__init__.py index 7c90b21..e69de29 100644 --- a/dav_auth/__init__.py +++ b/dav_auth/__init__.py @@ -1 +0,0 @@ -default_app_config = 'dav_auth.apps.AppConfig' # pylint: disable=invalid-name diff --git a/dav_auth/module.json b/dav_auth/module.json index 2f1e776..dfc3a65 100644 --- a/dav_auth/module.json +++ b/dav_auth/module.json @@ -1,3 +1,4 @@ { - "url_prefix": "auth" + "url_prefix": "auth", + "app_config": ".apps.AppConfig" } \ No newline at end of file diff --git a/dav_base/__init__.py b/dav_base/__init__.py index c57740f..e69de29 100644 --- a/dav_base/__init__.py +++ b/dav_base/__init__.py @@ -1 +0,0 @@ -default_app_config = 'dav_base.apps.AppConfig' # pylint: disable=invalid-name diff --git a/dav_base/config/modules.py b/dav_base/config/modules.py index 063a76e..ac0f7da 100644 --- a/dav_base/config/modules.py +++ b/dav_base/config/modules.py @@ -19,6 +19,7 @@ class ModuleMeta: def __init__(self, package_name): self._package_name = package_name + self._app_config = None self._additional_apps = [] self._url_prefix = None self._load_from_package() @@ -28,9 +29,19 @@ class ModuleMeta: return t @property - def app(self): + def package(self): return self._package_name + @property + def app(self): + if self._app_config: + app = self._app_config + if app.startswith('.'): + app = self._package_name + app + else: + app = self._package_name + return app + @property def additional_apps(self): return self._additional_apps @@ -61,6 +72,7 @@ class ModuleMeta: def load_from_dict(self, meta_dict): self._package_name = meta_dict.get('package', None) + self._app_config = meta_dict.get('app_config', None) self._additional_apps = meta_dict.get('additional_apps', []) self._url_prefix = meta_dict.get('url_prefix', None) @@ -68,6 +80,8 @@ class ModuleMeta: d = { 'package': self._package_name, } + if self._app_config: + d['app_config'] = self._app_config if self._additional_apps: d['additional_apps'] = self._additional_apps if self._url_prefix: diff --git a/dav_base/console_scripts/django_project_config/additional_settings.py b/dav_base/console_scripts/django_project_config/additional_settings.py index 1bd7468..4bdde64 100644 --- a/dav_base/console_scripts/django_project_config/additional_settings.py +++ b/dav_base/console_scripts/django_project_config/additional_settings.py @@ -16,7 +16,7 @@ INSTALLED_APPS += [ 'django_countries', # 'django_extensions', # Our main app - 'dav_base', + 'dav_base.apps.AppConfig', ] # Add apps from our modules diff --git a/dav_base/views.py b/dav_base/views.py index 76422ba..d07fd7c 100644 --- a/dav_base/views.py +++ b/dav_base/views.py @@ -15,7 +15,7 @@ class RootView(generic.TemplateView): root_url_name = '%s:%s' % (module_meta_obj.url_namespace, root_url_name) try: reverse(root_url_name) - root_urls.append((module_meta_obj.app, root_url_name)) + root_urls.append((module_meta_obj.package, root_url_name)) except NoReverseMatch: pass diff --git a/dav_event_office/__init__.py b/dav_event_office/__init__.py index 2136438..e69de29 100644 --- a/dav_event_office/__init__.py +++ b/dav_event_office/__init__.py @@ -1 +0,0 @@ -default_app_config = 'dav_event_office.apps.AppConfig' # pylint: disable=invalid-name diff --git a/dav_event_office/module.json b/dav_event_office/module.json index 5a4ef89..b851441 100644 --- a/dav_event_office/module.json +++ b/dav_event_office/module.json @@ -1,3 +1,4 @@ { - "url_prefix": "office/events" + "url_prefix": "office/events", + "app_config": ".apps.AppConfig" } \ No newline at end of file diff --git a/dav_events/__init__.py b/dav_events/__init__.py index 54def6e..e69de29 100644 --- a/dav_events/__init__.py +++ b/dav_events/__init__.py @@ -1 +0,0 @@ -default_app_config = 'dav_events.apps.AppConfig' # pylint: disable=invalid-name diff --git a/dav_events/module.json b/dav_events/module.json index ccce349..ea65ba9 100644 --- a/dav_events/module.json +++ b/dav_events/module.json @@ -1,3 +1,4 @@ { - "url_prefix": "events" + "url_prefix": "events", + "app_config": ".apps.AppConfig" } \ No newline at end of file diff --git a/dav_registration/__init__.py b/dav_registration/__init__.py index f6bcdc8..e69de29 100644 --- a/dav_registration/__init__.py +++ b/dav_registration/__init__.py @@ -1 +0,0 @@ -default_app_config = 'dav_registration.apps.AppConfig' # pylint: disable=invalid-name diff --git a/dav_registration/module.json b/dav_registration/module.json index 544b4cf..211a3e9 100644 --- a/dav_registration/module.json +++ b/dav_registration/module.json @@ -1,3 +1,4 @@ { - "url_prefix": "registration" + "url_prefix": "registration", + "app_config": ".apps.AppConfig" } \ No newline at end of file