diff --git a/.tx/config b/.tx/config index a5ccdead86..ab11861127 100644 --- a/.tx/config +++ b/.tx/config @@ -50,8 +50,8 @@ source_lang = en type = PO [wagtail.wagtailusers] -file_filter = wagtail/wagtailusers/locale//LC_MESSAGES/django.po -source_file = wagtail/wagtailusers/locale/en/LC_MESSAGES/django.po +file_filter = wagtail/users/locale//LC_MESSAGES/django.po +source_file = wagtail/users/locale/en/LC_MESSAGES/django.po source_lang = en type = PO diff --git a/docs/advanced_topics/customisation/custom_user_models.rst b/docs/advanced_topics/customisation/custom_user_models.rst index e6f044e636..371782c97f 100644 --- a/docs/advanced_topics/customisation/custom_user_models.rst +++ b/docs/advanced_topics/customisation/custom_user_models.rst @@ -30,7 +30,7 @@ Create your custom user create and edit forms in your app: from django import forms from django.utils.translation import ugettext_lazy as _ - from wagtail.wagtailusers.forms import UserEditForm, UserCreationForm + from wagtail.users.forms import UserEditForm, UserCreationForm from users.models import MembershipStatus diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 2eec5f5e7d..dcfc99dde7 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -64,7 +64,7 @@ Apps (``settings.py``) 'wagtail.wagtailredirects', 'wagtail.embeds', 'wagtail.sites', - 'wagtail.wagtailusers', + 'wagtail.users', 'wagtail.snippets', 'wagtail.documents', 'wagtail.images', @@ -506,7 +506,7 @@ These two files should reside in your project directory (``myproject/myproject/` 'wagtail.wagtailredirects', 'wagtail.embeds', 'wagtail.sites', - 'wagtail.wagtailusers', + 'wagtail.users', 'wagtail.snippets', 'wagtail.documents', 'wagtail.images', diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index a988b77c01..306428877d 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -24,7 +24,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``: 'wagtail.wagtailredirects', 'wagtail.embeds', 'wagtail.sites', - 'wagtail.wagtailusers', + 'wagtail.users', 'wagtail.snippets', 'wagtail.documents', 'wagtail.images', diff --git a/gulpfile.js/config.js b/gulpfile.js/config.js index a12897cc59..3f23181a5c 100644 --- a/gulpfile.js/config.js +++ b/gulpfile.js/config.js @@ -28,7 +28,7 @@ var apps = [ new App('wagtail/embeds'), new App('wagtail/images'), new App('wagtail/snippets'), - new App('wagtail/wagtailusers'), + new App('wagtail/users'), new App('wagtail/contrib/wagtailstyleguide'), new App('wagtail/contrib/settings', { 'appName': 'wagtailsettings', diff --git a/wagtail/admin/tests/test_account_management.py b/wagtail/admin/tests/test_account_management.py index ddaabf9a51..a7301a62e2 100644 --- a/wagtail/admin/tests/test_account_management.py +++ b/wagtail/admin/tests/test_account_management.py @@ -10,7 +10,7 @@ from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils from wagtail.admin.utils import ( WAGTAILADMIN_PROVIDED_LANGUAGES, get_available_admin_languages) -from wagtail.wagtailusers.models import UserProfile +from wagtail.users.models import UserProfile class TestAuthentication(TestCase, WagtailTestUtils): diff --git a/wagtail/admin/tests/test_pages_views.py b/wagtail/admin/tests/test_pages_views.py index 76ccd3904a..8b562bb41f 100644 --- a/wagtail/admin/tests/test_pages_views.py +++ b/wagtail/admin/tests/test_pages_views.py @@ -31,7 +31,7 @@ from wagtail.admin.views.pages import PreviewOnEdit from wagtail.core.models import GroupPagePermission, Page, PageRevision, Site from wagtail.core.signals import page_published, page_unpublished from wagtail.search.index import SearchField -from wagtail.wagtailusers.models import UserProfile +from wagtail.users.models import UserProfile def submittable_timestamp(timestamp): diff --git a/wagtail/admin/utils.py b/wagtail/admin/utils.py index 727221e310..9d6d9ff1fc 100644 --- a/wagtail/admin/utils.py +++ b/wagtail/admin/utils.py @@ -18,7 +18,7 @@ from modelcluster.fields import ParentalKey from taggit.models import Tag from wagtail.core.models import GroupPagePermission, Page, PageRevision -from wagtail.wagtailusers.models import UserProfile +from wagtail.users.models import UserProfile logger = logging.getLogger('wagtail.admin') diff --git a/wagtail/admin/views/account.py b/wagtail/admin/views/account.py index 799bb13081..17649ce4ac 100644 --- a/wagtail/admin/views/account.py +++ b/wagtail/admin/views/account.py @@ -17,8 +17,8 @@ from django.views.decorators.debug import sensitive_post_parameters from wagtail.admin import forms from wagtail.admin.utils import get_available_admin_languages from wagtail.core.models import UserPagePermissionsProxy -from wagtail.wagtailusers.forms import NotificationPreferencesForm, PreferredLanguageForm -from wagtail.wagtailusers.models import UserProfile +from wagtail.users.forms import NotificationPreferencesForm, PreferredLanguageForm +from wagtail.users.models import UserProfile # Helper functions to check password management settings to enable/disable views as appropriate. diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 5e9079b032..49f5cbd73c 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -33,7 +33,7 @@ INSTALLED_APPS = [ 'wagtail.wagtailredirects', 'wagtail.embeds', 'wagtail.sites', - 'wagtail.wagtailusers', + 'wagtail.users', 'wagtail.snippets', 'wagtail.documents', 'wagtail.images', diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index c2821503c3..010da9c509 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -123,7 +123,7 @@ INSTALLED_APPS = ( 'wagtail.embeds', 'wagtail.images', 'wagtail.sites', - 'wagtail.wagtailusers', + 'wagtail.users', 'wagtail.snippets', 'wagtail.documents', 'wagtail.admin', diff --git a/wagtail/wagtailusers/.gitignore b/wagtail/users/.gitignore similarity index 100% rename from wagtail/wagtailusers/.gitignore rename to wagtail/users/.gitignore diff --git a/wagtail/users/__init__.py b/wagtail/users/__init__.py new file mode 100644 index 0000000000..e2f8ef6913 --- /dev/null +++ b/wagtail/users/__init__.py @@ -0,0 +1 @@ +default_app_config = 'wagtail.users.apps.WagtailUsersAppConfig' diff --git a/wagtail/wagtailusers/apps.py b/wagtail/users/apps.py similarity index 85% rename from wagtail/wagtailusers/apps.py rename to wagtail/users/apps.py index fd11b7d2c9..dd0736d1b6 100644 --- a/wagtail/wagtailusers/apps.py +++ b/wagtail/users/apps.py @@ -4,6 +4,6 @@ from django.apps import AppConfig class WagtailUsersAppConfig(AppConfig): - name = 'wagtail.wagtailusers' + name = 'wagtail.users' label = 'wagtailusers' verbose_name = "Wagtail users" diff --git a/wagtail/wagtailusers/forms.py b/wagtail/users/forms.py similarity index 99% rename from wagtail/wagtailusers/forms.py rename to wagtail/users/forms.py index 488dcadec2..f997d6faf4 100644 --- a/wagtail/wagtailusers/forms.py +++ b/wagtail/users/forms.py @@ -20,7 +20,7 @@ from wagtail.core import hooks from wagtail.core.models import ( PAGE_PERMISSION_TYPE_CHOICES, PAGE_PERMISSION_TYPES, GroupPagePermission, Page, UserPagePermissionsProxy) -from wagtail.wagtailusers.models import UserProfile +from wagtail.users.models import UserProfile User = get_user_model() diff --git a/wagtail/wagtailusers/locale/ar/LC_MESSAGES/django.mo b/wagtail/users/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/ar/LC_MESSAGES/django.mo rename to wagtail/users/locale/ar/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/ar/LC_MESSAGES/django.po b/wagtail/users/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/ar/LC_MESSAGES/django.po rename to wagtail/users/locale/ar/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/bg/LC_MESSAGES/django.mo b/wagtail/users/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/bg/LC_MESSAGES/django.mo rename to wagtail/users/locale/bg/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/bg/LC_MESSAGES/django.po b/wagtail/users/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/bg/LC_MESSAGES/django.po rename to wagtail/users/locale/bg/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/ca/LC_MESSAGES/django.mo b/wagtail/users/locale/ca/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/ca/LC_MESSAGES/django.mo rename to wagtail/users/locale/ca/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/ca/LC_MESSAGES/django.po b/wagtail/users/locale/ca/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/ca/LC_MESSAGES/django.po rename to wagtail/users/locale/ca/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/cs/LC_MESSAGES/django.mo b/wagtail/users/locale/cs/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/cs/LC_MESSAGES/django.mo rename to wagtail/users/locale/cs/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/cs/LC_MESSAGES/django.po b/wagtail/users/locale/cs/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/cs/LC_MESSAGES/django.po rename to wagtail/users/locale/cs/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/de/LC_MESSAGES/django.mo b/wagtail/users/locale/de/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/de/LC_MESSAGES/django.mo rename to wagtail/users/locale/de/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/de/LC_MESSAGES/django.po b/wagtail/users/locale/de/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/de/LC_MESSAGES/django.po rename to wagtail/users/locale/de/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.mo b/wagtail/users/locale/el/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/el/LC_MESSAGES/django.mo rename to wagtail/users/locale/el/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/el/LC_MESSAGES/django.po b/wagtail/users/locale/el/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/el/LC_MESSAGES/django.po rename to wagtail/users/locale/el/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/en/LC_MESSAGES/django.mo b/wagtail/users/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/en/LC_MESSAGES/django.mo rename to wagtail/users/locale/en/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/en/LC_MESSAGES/django.po b/wagtail/users/locale/en/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/en/LC_MESSAGES/django.po rename to wagtail/users/locale/en/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/es/LC_MESSAGES/django.mo b/wagtail/users/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/es/LC_MESSAGES/django.mo rename to wagtail/users/locale/es/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/es/LC_MESSAGES/django.po b/wagtail/users/locale/es/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/es/LC_MESSAGES/django.po rename to wagtail/users/locale/es/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/fa/LC_MESSAGES/django.mo b/wagtail/users/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/fa/LC_MESSAGES/django.mo rename to wagtail/users/locale/fa/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/fa/LC_MESSAGES/django.po b/wagtail/users/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/fa/LC_MESSAGES/django.po rename to wagtail/users/locale/fa/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/fi/LC_MESSAGES/django.mo b/wagtail/users/locale/fi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/fi/LC_MESSAGES/django.mo rename to wagtail/users/locale/fi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/fi/LC_MESSAGES/django.po b/wagtail/users/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/fi/LC_MESSAGES/django.po rename to wagtail/users/locale/fi/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/fr/LC_MESSAGES/django.mo b/wagtail/users/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/fr/LC_MESSAGES/django.mo rename to wagtail/users/locale/fr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/fr/LC_MESSAGES/django.po b/wagtail/users/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/fr/LC_MESSAGES/django.po rename to wagtail/users/locale/fr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/gl/LC_MESSAGES/django.mo b/wagtail/users/locale/gl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/gl/LC_MESSAGES/django.mo rename to wagtail/users/locale/gl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/gl/LC_MESSAGES/django.po b/wagtail/users/locale/gl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/gl/LC_MESSAGES/django.po rename to wagtail/users/locale/gl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/users/locale/he_IL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/he_IL/LC_MESSAGES/django.mo rename to wagtail/users/locale/he_IL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/he_IL/LC_MESSAGES/django.po b/wagtail/users/locale/he_IL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/he_IL/LC_MESSAGES/django.po rename to wagtail/users/locale/he_IL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/hr_HR/LC_MESSAGES/django.mo b/wagtail/users/locale/hr_HR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/hr_HR/LC_MESSAGES/django.mo rename to wagtail/users/locale/hr_HR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/hr_HR/LC_MESSAGES/django.po b/wagtail/users/locale/hr_HR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/hr_HR/LC_MESSAGES/django.po rename to wagtail/users/locale/hr_HR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/hu/LC_MESSAGES/django.mo b/wagtail/users/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/hu/LC_MESSAGES/django.mo rename to wagtail/users/locale/hu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/hu/LC_MESSAGES/django.po b/wagtail/users/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/hu/LC_MESSAGES/django.po rename to wagtail/users/locale/hu/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/users/locale/id_ID/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/id_ID/LC_MESSAGES/django.mo rename to wagtail/users/locale/id_ID/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/id_ID/LC_MESSAGES/django.po b/wagtail/users/locale/id_ID/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/id_ID/LC_MESSAGES/django.po rename to wagtail/users/locale/id_ID/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/users/locale/is_IS/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/is_IS/LC_MESSAGES/django.mo rename to wagtail/users/locale/is_IS/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/is_IS/LC_MESSAGES/django.po b/wagtail/users/locale/is_IS/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/is_IS/LC_MESSAGES/django.po rename to wagtail/users/locale/is_IS/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/it/LC_MESSAGES/django.mo b/wagtail/users/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/it/LC_MESSAGES/django.mo rename to wagtail/users/locale/it/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/it/LC_MESSAGES/django.po b/wagtail/users/locale/it/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/it/LC_MESSAGES/django.po rename to wagtail/users/locale/it/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/ja/LC_MESSAGES/django.mo b/wagtail/users/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/ja/LC_MESSAGES/django.mo rename to wagtail/users/locale/ja/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/ja/LC_MESSAGES/django.po b/wagtail/users/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/ja/LC_MESSAGES/django.po rename to wagtail/users/locale/ja/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/ka/LC_MESSAGES/django.mo b/wagtail/users/locale/ka/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/ka/LC_MESSAGES/django.mo rename to wagtail/users/locale/ka/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/ka/LC_MESSAGES/django.po b/wagtail/users/locale/ka/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/ka/LC_MESSAGES/django.po rename to wagtail/users/locale/ka/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/ko/LC_MESSAGES/django.mo b/wagtail/users/locale/ko/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/ko/LC_MESSAGES/django.mo rename to wagtail/users/locale/ko/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/ko/LC_MESSAGES/django.po b/wagtail/users/locale/ko/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/ko/LC_MESSAGES/django.po rename to wagtail/users/locale/ko/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/lt/LC_MESSAGES/django.mo b/wagtail/users/locale/lt/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/lt/LC_MESSAGES/django.mo rename to wagtail/users/locale/lt/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/lt/LC_MESSAGES/django.po b/wagtail/users/locale/lt/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/lt/LC_MESSAGES/django.po rename to wagtail/users/locale/lt/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/lv/LC_MESSAGES/django.mo b/wagtail/users/locale/lv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/lv/LC_MESSAGES/django.mo rename to wagtail/users/locale/lv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/lv/LC_MESSAGES/django.po b/wagtail/users/locale/lv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/lv/LC_MESSAGES/django.po rename to wagtail/users/locale/lv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/nb/LC_MESSAGES/django.mo b/wagtail/users/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/nb/LC_MESSAGES/django.mo rename to wagtail/users/locale/nb/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/nb/LC_MESSAGES/django.po b/wagtail/users/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/nb/LC_MESSAGES/django.po rename to wagtail/users/locale/nb/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/nl/LC_MESSAGES/django.mo b/wagtail/users/locale/nl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/nl/LC_MESSAGES/django.mo rename to wagtail/users/locale/nl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/nl/LC_MESSAGES/django.po b/wagtail/users/locale/nl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/nl/LC_MESSAGES/django.po rename to wagtail/users/locale/nl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/users/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/nl_NL/LC_MESSAGES/django.mo rename to wagtail/users/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/users/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/nl_NL/LC_MESSAGES/django.po rename to wagtail/users/locale/nl_NL/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/pl/LC_MESSAGES/django.mo b/wagtail/users/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/pl/LC_MESSAGES/django.mo rename to wagtail/users/locale/pl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/pl/LC_MESSAGES/django.po b/wagtail/users/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/pl/LC_MESSAGES/django.po rename to wagtail/users/locale/pl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/users/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/pt_BR/LC_MESSAGES/django.mo rename to wagtail/users/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/users/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/pt_BR/LC_MESSAGES/django.po rename to wagtail/users/locale/pt_BR/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/users/locale/pt_PT/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/pt_PT/LC_MESSAGES/django.mo rename to wagtail/users/locale/pt_PT/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/users/locale/pt_PT/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/pt_PT/LC_MESSAGES/django.po rename to wagtail/users/locale/pt_PT/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/ro/LC_MESSAGES/django.mo b/wagtail/users/locale/ro/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/ro/LC_MESSAGES/django.mo rename to wagtail/users/locale/ro/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/ro/LC_MESSAGES/django.po b/wagtail/users/locale/ro/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/ro/LC_MESSAGES/django.po rename to wagtail/users/locale/ro/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/ru/LC_MESSAGES/django.mo b/wagtail/users/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/ru/LC_MESSAGES/django.mo rename to wagtail/users/locale/ru/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/ru/LC_MESSAGES/django.po b/wagtail/users/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/ru/LC_MESSAGES/django.po rename to wagtail/users/locale/ru/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/users/locale/sk_SK/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/sk_SK/LC_MESSAGES/django.mo rename to wagtail/users/locale/sk_SK/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/users/locale/sk_SK/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/sk_SK/LC_MESSAGES/django.po rename to wagtail/users/locale/sk_SK/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/sl/LC_MESSAGES/django.mo b/wagtail/users/locale/sl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/sl/LC_MESSAGES/django.mo rename to wagtail/users/locale/sl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/sl/LC_MESSAGES/django.po b/wagtail/users/locale/sl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/sl/LC_MESSAGES/django.po rename to wagtail/users/locale/sl/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/sv/LC_MESSAGES/django.mo b/wagtail/users/locale/sv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/sv/LC_MESSAGES/django.mo rename to wagtail/users/locale/sv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/sv/LC_MESSAGES/django.po b/wagtail/users/locale/sv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/sv/LC_MESSAGES/django.po rename to wagtail/users/locale/sv/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/tr/LC_MESSAGES/django.mo b/wagtail/users/locale/tr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/tr/LC_MESSAGES/django.mo rename to wagtail/users/locale/tr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/tr/LC_MESSAGES/django.po b/wagtail/users/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/tr/LC_MESSAGES/django.po rename to wagtail/users/locale/tr/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/vi/LC_MESSAGES/django.mo b/wagtail/users/locale/vi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/vi/LC_MESSAGES/django.mo rename to wagtail/users/locale/vi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/vi/LC_MESSAGES/django.po b/wagtail/users/locale/vi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/vi/LC_MESSAGES/django.po rename to wagtail/users/locale/vi/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/zh/LC_MESSAGES/django.mo b/wagtail/users/locale/zh/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/zh/LC_MESSAGES/django.mo rename to wagtail/users/locale/zh/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/zh/LC_MESSAGES/django.po b/wagtail/users/locale/zh/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/zh/LC_MESSAGES/django.po rename to wagtail/users/locale/zh/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/users/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtailusers/locale/zh_CN/LC_MESSAGES/django.mo rename to wagtail/users/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/wagtail/wagtailusers/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/users/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtailusers/locale/zh_CN/LC_MESSAGES/django.po rename to wagtail/users/locale/zh_CN/LC_MESSAGES/django.po diff --git a/wagtail/wagtailusers/migrations/0001_initial.py b/wagtail/users/migrations/0001_initial.py similarity index 100% rename from wagtail/wagtailusers/migrations/0001_initial.py rename to wagtail/users/migrations/0001_initial.py diff --git a/wagtail/wagtailusers/migrations/0002_add_verbose_name_on_userprofile.py b/wagtail/users/migrations/0002_add_verbose_name_on_userprofile.py similarity index 100% rename from wagtail/wagtailusers/migrations/0002_add_verbose_name_on_userprofile.py rename to wagtail/users/migrations/0002_add_verbose_name_on_userprofile.py diff --git a/wagtail/wagtailusers/migrations/0003_add_verbose_names.py b/wagtail/users/migrations/0003_add_verbose_names.py similarity index 100% rename from wagtail/wagtailusers/migrations/0003_add_verbose_names.py rename to wagtail/users/migrations/0003_add_verbose_names.py diff --git a/wagtail/wagtailusers/migrations/0004_capitalizeverbose.py b/wagtail/users/migrations/0004_capitalizeverbose.py similarity index 100% rename from wagtail/wagtailusers/migrations/0004_capitalizeverbose.py rename to wagtail/users/migrations/0004_capitalizeverbose.py diff --git a/wagtail/wagtailusers/migrations/0005_make_related_name_wagtail_specific.py b/wagtail/users/migrations/0005_make_related_name_wagtail_specific.py similarity index 100% rename from wagtail/wagtailusers/migrations/0005_make_related_name_wagtail_specific.py rename to wagtail/users/migrations/0005_make_related_name_wagtail_specific.py diff --git a/wagtail/wagtailusers/migrations/0006_userprofile_prefered_language.py b/wagtail/users/migrations/0006_userprofile_prefered_language.py similarity index 100% rename from wagtail/wagtailusers/migrations/0006_userprofile_prefered_language.py rename to wagtail/users/migrations/0006_userprofile_prefered_language.py diff --git a/wagtail/wagtailusers/migrations/__init__.py b/wagtail/users/migrations/__init__.py similarity index 100% rename from wagtail/wagtailusers/migrations/__init__.py rename to wagtail/users/migrations/__init__.py diff --git a/wagtail/wagtailusers/models.py b/wagtail/users/models.py similarity index 100% rename from wagtail/wagtailusers/models.py rename to wagtail/users/models.py diff --git a/wagtail/wagtailusers/static_src/wagtailusers/js/group-form.js b/wagtail/users/static_src/wagtailusers/js/group-form.js similarity index 100% rename from wagtail/wagtailusers/static_src/wagtailusers/js/group-form.js rename to wagtail/users/static_src/wagtailusers/js/group-form.js diff --git a/wagtail/wagtailusers/static_src/wagtailusers/scss/groups_edit.scss b/wagtail/users/static_src/wagtailusers/scss/groups_edit.scss similarity index 100% rename from wagtail/wagtailusers/static_src/wagtailusers/scss/groups_edit.scss rename to wagtail/users/static_src/wagtailusers/scss/groups_edit.scss diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/confirm_delete.html b/wagtail/users/templates/wagtailusers/groups/confirm_delete.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/confirm_delete.html rename to wagtail/users/templates/wagtailusers/groups/confirm_delete.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html b/wagtail/users/templates/wagtailusers/groups/create.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/create.html rename to wagtail/users/templates/wagtailusers/groups/create.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html b/wagtail/users/templates/wagtailusers/groups/edit.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/edit.html rename to wagtail/users/templates/wagtailusers/groups/edit.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/formatted_permissions.html b/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/includes/formatted_permissions.html rename to wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/group_form_js.html b/wagtail/users/templates/wagtailusers/groups/includes/group_form_js.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/includes/group_form_js.html rename to wagtail/users/templates/wagtailusers/groups/includes/group_form_js.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_form.html b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_form.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_form.html rename to wagtail/users/templates/wagtailusers/groups/includes/page_permissions_form.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_formset.html b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_formset.html rename to wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/index.html b/wagtail/users/templates/wagtailusers/groups/index.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/index.html rename to wagtail/users/templates/wagtailusers/groups/index.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/list.html b/wagtail/users/templates/wagtailusers/groups/list.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/list.html rename to wagtail/users/templates/wagtailusers/groups/list.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/results.html b/wagtail/users/templates/wagtailusers/groups/results.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/groups/results.html rename to wagtail/users/templates/wagtailusers/groups/results.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/confirm_delete.html b/wagtail/users/templates/wagtailusers/users/confirm_delete.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/users/confirm_delete.html rename to wagtail/users/templates/wagtailusers/users/confirm_delete.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/create.html b/wagtail/users/templates/wagtailusers/users/create.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/users/create.html rename to wagtail/users/templates/wagtailusers/users/create.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/edit.html b/wagtail/users/templates/wagtailusers/users/edit.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/users/edit.html rename to wagtail/users/templates/wagtailusers/users/edit.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/index.html b/wagtail/users/templates/wagtailusers/users/index.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/users/index.html rename to wagtail/users/templates/wagtailusers/users/index.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/list.html b/wagtail/users/templates/wagtailusers/users/list.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/users/list.html rename to wagtail/users/templates/wagtailusers/users/list.html diff --git a/wagtail/wagtailusers/templates/wagtailusers/users/results.html b/wagtail/users/templates/wagtailusers/users/results.html similarity index 100% rename from wagtail/wagtailusers/templates/wagtailusers/users/results.html rename to wagtail/users/templates/wagtailusers/users/results.html diff --git a/wagtail/wagtailusers/templatetags/__init__.py b/wagtail/users/templatetags/__init__.py similarity index 100% rename from wagtail/wagtailusers/templatetags/__init__.py rename to wagtail/users/templatetags/__init__.py diff --git a/wagtail/wagtailusers/templatetags/wagtailusers_tags.py b/wagtail/users/templatetags/wagtailusers_tags.py similarity index 100% rename from wagtail/wagtailusers/templatetags/wagtailusers_tags.py rename to wagtail/users/templatetags/wagtailusers_tags.py diff --git a/wagtail/wagtailusers/tests.py b/wagtail/users/tests.py similarity index 98% rename from wagtail/wagtailusers/tests.py rename to wagtail/users/tests.py index 0285f0194a..e852fdfe50 100644 --- a/wagtail/wagtailusers/tests.py +++ b/wagtail/users/tests.py @@ -14,9 +14,9 @@ from wagtail.core import hooks from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME from wagtail.core.models import ( Collection, GroupCollectionPermission, GroupPagePermission, Page) -from wagtail.wagtailusers.forms import UserCreationForm, UserEditForm -from wagtail.wagtailusers.models import UserProfile -from wagtail.wagtailusers.views.users import get_user_creation_form, get_user_edit_form +from wagtail.users.forms import UserCreationForm, UserEditForm +from wagtail.users.models import UserProfile +from wagtail.users.views.users import get_user_creation_form, get_user_edit_form delete_user_perm_codename = "delete_{0}".format(AUTH_USER_MODEL_NAME.lower()) change_user_perm_codename = "change_{0}".format(AUTH_USER_MODEL_NAME.lower()) @@ -43,27 +43,27 @@ class TestUserFormHelpers(TestCase): self.assertIs(user_form, UserCreationForm) @override_settings( - WAGTAIL_USER_CREATION_FORM='wagtail.wagtailusers.tests.CustomUserCreationForm' + WAGTAIL_USER_CREATION_FORM='wagtail.users.tests.CustomUserCreationForm' ) def test_get_user_creation_form_with_custom_form(self): user_form = get_user_creation_form() self.assertIs(user_form, CustomUserCreationForm) @override_settings( - WAGTAIL_USER_EDIT_FORM='wagtail.wagtailusers.tests.CustomUserEditForm' + WAGTAIL_USER_EDIT_FORM='wagtail.users.tests.CustomUserEditForm' ) def test_get_user_edit_form_with_custom_form(self): user_form = get_user_edit_form() self.assertIs(user_form, CustomUserEditForm) @override_settings( - WAGTAIL_USER_CREATION_FORM='wagtail.wagtailusers.tests.CustomUserCreationFormDoesNotExist' + WAGTAIL_USER_CREATION_FORM='wagtail.users.tests.CustomUserCreationFormDoesNotExist' ) def test_get_user_creation_form_with_invalid_form(self): self.assertRaises(ImproperlyConfigured, get_user_creation_form) @override_settings( - WAGTAIL_USER_EDIT_FORM='wagtail.wagtailusers.tests.CustomUserEditFormDoesNotExist' + WAGTAIL_USER_EDIT_FORM='wagtail.users.tests.CustomUserEditFormDoesNotExist' ) def test_get_user_edit_form_with_invalid_form(self): self.assertRaises(ImproperlyConfigured, get_user_edit_form) @@ -158,7 +158,7 @@ class TestUserCreateView(TestCase, WagtailTestUtils): self.assertEqual(users.first().email, 'test@user.com') @override_settings( - WAGTAIL_USER_CREATION_FORM='wagtail.wagtailusers.tests.CustomUserCreationForm', + WAGTAIL_USER_CREATION_FORM='wagtail.users.tests.CustomUserCreationForm', WAGTAIL_USER_CUSTOM_FIELDS=['country', 'document'], ) def test_create_with_custom_form(self): @@ -730,7 +730,7 @@ class TestUserEditView(TestCase, WagtailTestUtils): self.assertEqual(user.is_active, True) @override_settings( - WAGTAIL_USER_EDIT_FORM='wagtail.wagtailusers.tests.CustomUserEditForm', + WAGTAIL_USER_EDIT_FORM='wagtail.users.tests.CustomUserEditForm', ) def test_edit_with_custom_form(self): response = self.post({ diff --git a/wagtail/wagtailusers/urls/__init__.py b/wagtail/users/urls/__init__.py similarity index 100% rename from wagtail/wagtailusers/urls/__init__.py rename to wagtail/users/urls/__init__.py diff --git a/wagtail/wagtailusers/urls/users.py b/wagtail/users/urls/users.py similarity index 88% rename from wagtail/wagtailusers/urls/users.py rename to wagtail/users/urls/users.py index 8ec607b566..b5359ec3d3 100644 --- a/wagtail/wagtailusers/urls/users.py +++ b/wagtail/users/urls/users.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtailusers.views import users +from wagtail.users.views import users app_name = 'wagtailusers_users' urlpatterns = [ diff --git a/wagtail/wagtailusers/utils.py b/wagtail/users/utils.py similarity index 100% rename from wagtail/wagtailusers/utils.py rename to wagtail/users/utils.py diff --git a/wagtail/wagtailusers/views/__init__.py b/wagtail/users/views/__init__.py similarity index 100% rename from wagtail/wagtailusers/views/__init__.py rename to wagtail/users/views/__init__.py diff --git a/wagtail/wagtailusers/views/groups.py b/wagtail/users/views/groups.py similarity index 98% rename from wagtail/wagtailusers/views/groups.py rename to wagtail/users/views/groups.py index f3e703a0a5..b9b71739b1 100644 --- a/wagtail/wagtailusers/views/groups.py +++ b/wagtail/users/views/groups.py @@ -6,7 +6,7 @@ from django.utils.translation import ugettext as _ from wagtail.admin.views import generic, mixins from wagtail.admin.viewsets.model import ModelViewSet from wagtail.core import hooks -from wagtail.wagtailusers.forms import GroupForm, GroupPagePermissionFormSet +from wagtail.users.forms import GroupForm, GroupPagePermissionFormSet _permission_panel_classes = None diff --git a/wagtail/wagtailusers/views/users.py b/wagtail/users/views/users.py similarity index 98% rename from wagtail/wagtailusers/views/users.py rename to wagtail/users/views/users.py index 6b81991f3d..432cc89b50 100644 --- a/wagtail/wagtailusers/views/users.py +++ b/wagtail/users/views/users.py @@ -17,8 +17,8 @@ from wagtail.admin.utils import ( any_permission_required, permission_denied, permission_required) from wagtail.core import hooks from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME -from wagtail.wagtailusers.forms import UserCreationForm, UserEditForm -from wagtail.wagtailusers.utils import user_can_delete_user +from wagtail.users.forms import UserCreationForm, UserEditForm +from wagtail.users.utils import user_can_delete_user User = get_user_model() diff --git a/wagtail/wagtailusers/wagtail_hooks.py b/wagtail/users/wagtail_hooks.py similarity index 94% rename from wagtail/wagtailusers/wagtail_hooks.py rename to wagtail/users/wagtail_hooks.py index 3a2d64f846..904e12b801 100644 --- a/wagtail/wagtailusers/wagtail_hooks.py +++ b/wagtail/users/wagtail_hooks.py @@ -10,10 +10,10 @@ from wagtail.admin.menu import MenuItem from wagtail.admin.search import SearchArea from wagtail.core import hooks from wagtail.core.compat import AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME -from wagtail.wagtailusers.urls import users -from wagtail.wagtailusers.utils import user_can_delete_user -from wagtail.wagtailusers.views.groups import GroupViewSet -from wagtail.wagtailusers.widgets import UserListingButton +from wagtail.users.urls import users +from wagtail.users.utils import user_can_delete_user +from wagtail.users.views.groups import GroupViewSet +from wagtail.users.widgets import UserListingButton @hooks.register('register_admin_urls') diff --git a/wagtail/wagtailusers/widgets.py b/wagtail/users/widgets.py similarity index 100% rename from wagtail/wagtailusers/widgets.py rename to wagtail/users/widgets.py diff --git a/wagtail/wagtailusers/__init__.py b/wagtail/wagtailusers/__init__.py deleted file mode 100644 index 088b3cb696..0000000000 --- a/wagtail/wagtailusers/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = 'wagtail.wagtailusers.apps.WagtailUsersAppConfig'