diff --git a/.tx/config b/.tx/config index 2bd2994db6..9c1ba47745 100644 --- a/.tx/config +++ b/.tx/config @@ -14,8 +14,8 @@ source_lang = en type = PO [wagtail.wagtaildocs] -file_filter = wagtail/wagtaildocs/locale//LC_MESSAGES/django.po -source_file = wagtail/wagtaildocs/locale/en/LC_MESSAGES/django.po +file_filter = wagtail/documents/locale//LC_MESSAGES/django.po +source_file = wagtail/documents/locale/en/LC_MESSAGES/django.po source_lang = en type = PO diff --git a/docs/advanced_topics/api/v2/configuration.rst b/docs/advanced_topics/api/v2/configuration.rst index 3899f41307..5ae5eac92f 100644 --- a/docs/advanced_topics/api/v2/configuration.rst +++ b/docs/advanced_topics/api/v2/configuration.rst @@ -45,7 +45,7 @@ Wagtail provides three endpoint classes you can use: - Pages :class:`wagtail.api.v2.endpoints.PagesAPIEndpoint` - Images :class:`wagtail.wagtailimages.api.v2.endpoints.ImagesAPIEndpoint` - - Documents :class:`wagtail.wagtaildocs.api.v2.endpoints.DocumentsAPIEndpoint` + - Documents :class:`wagtail.documents.api.v2.endpoints.DocumentsAPIEndpoint` You can subclass any of these endpoint classes to customise their functionality. Additionally, there is a base endpoint class you can use for adding different @@ -61,7 +61,7 @@ types in their default configuration: from wagtail.api.v2.endpoints import PagesAPIEndpoint from wagtail.api.v2.router import WagtailAPIRouter from wagtail.wagtailimages.api.v2.endpoints import ImagesAPIEndpoint - from wagtail.wagtaildocs.api.v2.endpoints import DocumentsAPIEndpoint + from wagtail.documents.api.v2.endpoints import DocumentsAPIEndpoint # Create the router. "wagtailapi" is the URL namespace api_router = WagtailAPIRouter('wagtailapi') diff --git a/docs/advanced_topics/documents/custom_document_model.rst b/docs/advanced_topics/documents/custom_document_model.rst index c90c130351..f181f61b40 100644 --- a/docs/advanced_topics/documents/custom_document_model.rst +++ b/docs/advanced_topics/documents/custom_document_model.rst @@ -8,7 +8,7 @@ additional fields. You need to complete the following steps in your project to do this: - Create a new document model that inherits from - ``wagtail.wagtaildocs.models.AbstractDocument``. This is where you would + ``wagtail.documents.models.AbstractDocument``. This is where you would add additional fields. - Point ``WAGTAILDOCS_DOCUMENT_MODEL`` to the new model. @@ -17,7 +17,7 @@ Here's an example: .. code-block:: python # models.py - from wagtail.wagtaildocs.models import Document, AbstractDocument + from wagtail.documents.models import Document, AbstractDocument class CustomDocument(AbstractDocument): # Custom field example: @@ -62,6 +62,6 @@ Then in your settings module: Referring to the document model =============================== -.. module:: wagtail.wagtaildocs.models +.. module:: wagtail.documents.models .. autofunction:: get_document_model diff --git a/docs/advanced_topics/i18n/index.rst b/docs/advanced_topics/i18n/index.rst index e496aa1315..bc4dad23d3 100644 --- a/docs/advanced_topics/i18n/index.rst +++ b/docs/advanced_topics/i18n/index.rst @@ -88,7 +88,7 @@ This feature is enabled through the project's root URL configuration. Just put t from django.contrib import admin from wagtail.admin import urls as wagtailadmin_urls - from wagtail.wagtaildocs import urls as wagtaildocs_urls + from wagtail.documents import urls as wagtaildocs_urls from wagtail.core import urls as wagtail_urls diff --git a/docs/advanced_topics/settings.rst b/docs/advanced_topics/settings.rst index 215159b214..62b139ff9a 100644 --- a/docs/advanced_topics/settings.rst +++ b/docs/advanced_topics/settings.rst @@ -66,7 +66,7 @@ Apps (``settings.py``) 'wagtail.wagtailsites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', - 'wagtail.wagtaildocs', + 'wagtail.documents', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.admin', @@ -449,7 +449,7 @@ URL Patterns from wagtail.core import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls - from wagtail.wagtaildocs import urls as wagtaildocs_urls + from wagtail.documents import urls as wagtaildocs_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls urlpatterns = [ @@ -508,7 +508,7 @@ These two files should reside in your project directory (``myproject/myproject/` 'wagtail.wagtailsites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', - 'wagtail.wagtaildocs', + 'wagtail.documents', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.admin', @@ -692,7 +692,7 @@ These two files should reside in your project directory (``myproject/myproject/` from wagtail.core import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls - from wagtail.wagtaildocs import urls as wagtaildocs_urls + from wagtail.documents import urls as wagtaildocs_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls diff --git a/docs/getting_started/integrating_into_django.rst b/docs/getting_started/integrating_into_django.rst index c4891dc4fd..802342363b 100644 --- a/docs/getting_started/integrating_into_django.rst +++ b/docs/getting_started/integrating_into_django.rst @@ -26,7 +26,7 @@ In your settings file, add the following apps to ``INSTALLED_APPS``: 'wagtail.wagtailsites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', - 'wagtail.wagtaildocs', + 'wagtail.documents', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.admin', @@ -64,7 +64,7 @@ Now make the following additions to your ``urls.py`` file: .. code-block:: python from wagtail.admin import urls as wagtailadmin_urls - from wagtail.wagtaildocs import urls as wagtaildocs_urls + from wagtail.documents import urls as wagtaildocs_urls from wagtail.core import urls as wagtail_urls urlpatterns = [ diff --git a/docs/reference/contrib/modeladmin/inspectview.rst b/docs/reference/contrib/modeladmin/inspectview.rst index cbbcc963c8..8be9a838f3 100644 --- a/docs/reference/contrib/modeladmin/inspectview.rst +++ b/docs/reference/contrib/modeladmin/inspectview.rst @@ -37,7 +37,7 @@ instance of ``wagtailimages.models.Image`` (or a custom model that subclasses ``wagtailimages.models.AbstractImage``), a thumbnail of that image will be rendered. -If you have `wagtail.wagtaildocs` installed, and the value happens to be an +If you have `wagtail.documents` installed, and the value happens to be an instance of `wagtaildocs.models.Document` (or a custom model that subclasses ``wagtaildocs.models.AbstractDocument``), a link to that document will be rendered, along with the document title, file extension and size. diff --git a/docs/reference/pages/panels.rst b/docs/reference/pages/panels.rst index 8bf56a567e..8a0aaa0d69 100644 --- a/docs/reference/pages/panels.rst +++ b/docs/reference/pages/panels.rst @@ -183,16 +183,16 @@ FormSubmissionsPanel DocumentChooserPanel -------------------- -.. module:: wagtail.wagtaildocs.edit_handlers +.. module:: wagtail.documents.edit_handlers .. class:: DocumentChooserPanel(field_name) - For files in other formats, Wagtail provides a generic file store through the :class:`~wagtail.wagtaildocs.models.Document` model: + For files in other formats, Wagtail provides a generic file store through the :class:`~wagtail.documents.models.Document` model: .. code-block:: python - from wagtail.wagtaildocs.models import Document - from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel + from wagtail.documents.models import Document + from wagtail.documents.edit_handlers import DocumentChooserPanel class BookPage(Page): diff --git a/docs/topics/pages.rst b/docs/topics/pages.rst index 81b0df6fd1..a4d549f616 100644 --- a/docs/topics/pages.rst +++ b/docs/topics/pages.rst @@ -160,7 +160,7 @@ These are used for structuring fields in the interface. - :class:`~wagtail.admin.edit_handlers.PageChooserPanel` - :class:`~wagtail.wagtailimages.edit_handlers.ImageChooserPanel` - - :class:`~wagtail.wagtaildocs.edit_handlers.DocumentChooserPanel` + - :class:`~wagtail.documents.edit_handlers.DocumentChooserPanel` - :class:`~wagtail.wagtailsnippets.edit_handlers.SnippetChooserPanel` .. note:: diff --git a/docs/topics/streamfield.rst b/docs/topics/streamfield.rst index b6be85dea4..9cbee685c2 100644 --- a/docs/topics/streamfield.rst +++ b/docs/topics/streamfield.rst @@ -270,7 +270,7 @@ A control for selecting a page object, using Wagtail's page browser. The followi DocumentChooserBlock ~~~~~~~~~~~~~~~~~~~~ -``wagtail.wagtaildocs.blocks.DocumentChooserBlock`` +``wagtail.documents.blocks.DocumentChooserBlock`` A control to allow the editor to select an existing document object, or upload a new one. The keyword argument ``required`` (default: True) is accepted. diff --git a/gulpfile.js/config.js b/gulpfile.js/config.js index e9452c7995..02b854697e 100644 --- a/gulpfile.js/config.js +++ b/gulpfile.js/config.js @@ -24,7 +24,7 @@ App.prototype.scssSources = function() { // All the Wagtail apps that contain static files var apps = [ new App('wagtail/admin'), - new App('wagtail/wagtaildocs'), + new App('wagtail/documents'), new App('wagtail/wagtailembeds'), new App('wagtail/wagtailimages'), new App('wagtail/wagtailsnippets'), diff --git a/tox.ini b/tox.ini index a931abc1f8..ecc071457d 100644 --- a/tox.ini +++ b/tox.ini @@ -26,8 +26,8 @@ ignore = D100,D101,D102,D103,D105,D200,D202,D204,D205,D209,D400,D401,E303,E501,N [testenv] install_command = pip install -e ".[testing]" -U {opts} {packages} commands = - elasticsearch2: coverage run runtests.py wagtail.wagtailsearch wagtail.wagtaildocs wagtail.wagtailimages --elasticsearch2 - elasticsearch5: coverage run runtests.py wagtail.wagtailsearch wagtail.wagtaildocs wagtail.wagtailimages --elasticsearch5 + elasticsearch2: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.wagtailimages --elasticsearch2 + elasticsearch5: coverage run runtests.py wagtail.wagtailsearch wagtail.documents wagtail.wagtailimages --elasticsearch5 noelasticsearch: coverage run runtests.py basepython = diff --git a/wagtail/admin/tests/api/test_documents.py b/wagtail/admin/tests/api/test_documents.py index 74f8bcdef4..725e55a5f8 100644 --- a/wagtail/admin/tests/api/test_documents.py +++ b/wagtail/admin/tests/api/test_documents.py @@ -5,7 +5,7 @@ import json from django.urls import reverse from wagtail.api.v2.tests.test_documents import TestDocumentDetail, TestDocumentListing -from wagtail.wagtaildocs.models import Document +from wagtail.documents.models import Document from .utils import AdminAPITestCase diff --git a/wagtail/admin/tests/test_collections_views.py b/wagtail/admin/tests/test_collections_views.py index 292d83a2ff..a055fc7d78 100644 --- a/wagtail/admin/tests/test_collections_views.py +++ b/wagtail/admin/tests/test_collections_views.py @@ -5,7 +5,7 @@ from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils from wagtail.core.models import Collection -from wagtail.wagtaildocs.models import Document +from wagtail.documents.models import Document class TestCollectionsIndexView(TestCase, WagtailTestUtils): diff --git a/wagtail/api/v2/signal_handlers.py b/wagtail/api/v2/signal_handlers.py index 7d1fa79c77..51644173bb 100644 --- a/wagtail/api/v2/signal_handlers.py +++ b/wagtail/api/v2/signal_handlers.py @@ -6,7 +6,7 @@ from django.urls import reverse from wagtail.contrib.wagtailfrontendcache.utils import purge_url_from_cache from wagtail.core.models import get_page_models from wagtail.core.signals import page_published, page_unpublished -from wagtail.wagtaildocs.models import get_document_model +from wagtail.documents.models import get_document_model from wagtail.wagtailimages import get_image_model from .utils import get_base_url diff --git a/wagtail/api/v2/tests/test_documents.py b/wagtail/api/v2/tests/test_documents.py index 2d0e062fd5..a86549037b 100644 --- a/wagtail/api/v2/tests/test_documents.py +++ b/wagtail/api/v2/tests/test_documents.py @@ -8,7 +8,7 @@ from django.test.utils import override_settings from django.urls import reverse from wagtail.api.v2 import signal_handlers -from wagtail.wagtaildocs.models import get_document_model +from wagtail.documents.models import get_document_model class TestDocumentListing(TestCase): diff --git a/wagtail/contrib/modeladmin/views.py b/wagtail/contrib/modeladmin/views.py index 13e22251cb..c29e918d49 100644 --- a/wagtail/contrib/modeladmin/views.py +++ b/wagtail/contrib/modeladmin/views.py @@ -880,7 +880,7 @@ class InspectView(InstanceSpecificView): # wagtail.wagtaildocuments might not be installed try: - from wagtail.wagtaildocs.models import AbstractDocument + from wagtail.documents.models import AbstractDocument if isinstance(val, AbstractDocument): # Render a link to the document return self.get_document_field_display(field_name, field) diff --git a/wagtail/contrib/wagtailstyleguide/views.py b/wagtail/contrib/wagtailstyleguide/views.py index a4cca94ae8..90e3bf6861 100644 --- a/wagtail/contrib/wagtailstyleguide/views.py +++ b/wagtail/contrib/wagtailstyleguide/views.py @@ -11,7 +11,7 @@ from wagtail.admin.rich_text import get_rich_text_editor_widget from wagtail.admin.widgets import ( AdminAutoHeightTextInput, AdminDateInput, AdminDateTimeInput, AdminPageChooser, AdminTimeInput) from wagtail.core.models import Page -from wagtail.wagtaildocs.widgets import AdminDocumentChooser +from wagtail.documents.widgets import AdminDocumentChooser from wagtail.wagtailimages.widgets import AdminImageChooser from wagtail.wagtailsnippets.widgets import AdminSnippetChooser diff --git a/wagtail/core/tests/test_collection_permission_policies.py b/wagtail/core/tests/test_collection_permission_policies.py index 8feff3b499..2ecaccaee1 100644 --- a/wagtail/core/tests/test_collection_permission_policies.py +++ b/wagtail/core/tests/test_collection_permission_policies.py @@ -9,7 +9,7 @@ from wagtail.core.models import Collection, GroupCollectionPermission from wagtail.core.permission_policies.collections import ( CollectionOwnershipPermissionPolicy, CollectionPermissionPolicy) from wagtail.core.tests.test_permission_policies import PermissionPolicyTestUtils -from wagtail.wagtaildocs.models import Document +from wagtail.documents.models import Document class PermissionPolicyTestCase(PermissionPolicyTestUtils, TestCase): diff --git a/wagtail/wagtaildocs/.gitignore b/wagtail/documents/.gitignore similarity index 100% rename from wagtail/wagtaildocs/.gitignore rename to wagtail/documents/.gitignore diff --git a/wagtail/documents/__init__.py b/wagtail/documents/__init__.py new file mode 100644 index 0000000000..d13f22c192 --- /dev/null +++ b/wagtail/documents/__init__.py @@ -0,0 +1 @@ +default_app_config = 'wagtail.documents.apps.WagtailDocsAppConfig' diff --git a/wagtail/wagtaildocs/admin.py b/wagtail/documents/admin.py similarity index 90% rename from wagtail/wagtaildocs/admin.py rename to wagtail/documents/admin.py index ed1e726415..76c454566a 100644 --- a/wagtail/wagtaildocs/admin.py +++ b/wagtail/documents/admin.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.conf import settings from django.contrib import admin -from wagtail.wagtaildocs.models import Document +from wagtail.documents.models import Document if hasattr(settings, 'WAGTAILDOCS_DOCUMENT_MODEL') and settings.WAGTAILDOCS_DOCUMENT_MODEL != 'wagtaildocs.Document': # This installation provides its own custom document class; diff --git a/wagtail/wagtaildocs/admin_urls.py b/wagtail/documents/admin_urls.py similarity index 92% rename from wagtail/wagtaildocs/admin_urls.py rename to wagtail/documents/admin_urls.py index 0468b9e8a4..0506c98d47 100644 --- a/wagtail/wagtaildocs/admin_urls.py +++ b/wagtail/documents/admin_urls.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtaildocs.views import chooser, documents, multiple +from wagtail.documents.views import chooser, documents, multiple app_name = 'wagtaildocs' urlpatterns = [ diff --git a/wagtail/wagtaildocs/api/__init__.py b/wagtail/documents/api/__init__.py similarity index 100% rename from wagtail/wagtaildocs/api/__init__.py rename to wagtail/documents/api/__init__.py diff --git a/wagtail/wagtaildocs/api/admin/__init__.py b/wagtail/documents/api/admin/__init__.py similarity index 100% rename from wagtail/wagtaildocs/api/admin/__init__.py rename to wagtail/documents/api/admin/__init__.py diff --git a/wagtail/wagtaildocs/api/admin/endpoints.py b/wagtail/documents/api/admin/endpoints.py similarity index 100% rename from wagtail/wagtaildocs/api/admin/endpoints.py rename to wagtail/documents/api/admin/endpoints.py diff --git a/wagtail/wagtaildocs/api/v2/__init__.py b/wagtail/documents/api/v2/__init__.py similarity index 100% rename from wagtail/wagtaildocs/api/v2/__init__.py rename to wagtail/documents/api/v2/__init__.py diff --git a/wagtail/wagtaildocs/api/v2/endpoints.py b/wagtail/documents/api/v2/endpoints.py similarity index 100% rename from wagtail/wagtaildocs/api/v2/endpoints.py rename to wagtail/documents/api/v2/endpoints.py diff --git a/wagtail/wagtaildocs/api/v2/serializers.py b/wagtail/documents/api/v2/serializers.py similarity index 100% rename from wagtail/wagtaildocs/api/v2/serializers.py rename to wagtail/documents/api/v2/serializers.py diff --git a/wagtail/wagtaildocs/apps.py b/wagtail/documents/apps.py similarity index 69% rename from wagtail/wagtaildocs/apps.py rename to wagtail/documents/apps.py index 8ad92cec7c..2ac258f4c0 100644 --- a/wagtail/wagtaildocs/apps.py +++ b/wagtail/documents/apps.py @@ -4,10 +4,10 @@ from django.apps import AppConfig class WagtailDocsAppConfig(AppConfig): - name = 'wagtail.wagtaildocs' + name = 'wagtail.documents' label = 'wagtaildocs' verbose_name = "Wagtail documents" def ready(self): - from wagtail.wagtaildocs.signal_handlers import register_signal_handlers + from wagtail.documents.signal_handlers import register_signal_handlers register_signal_handlers() diff --git a/wagtail/wagtaildocs/blocks.py b/wagtail/documents/blocks.py similarity index 82% rename from wagtail/wagtaildocs/blocks.py rename to wagtail/documents/blocks.py index 35cfc50ea0..1739aa114b 100644 --- a/wagtail/wagtaildocs/blocks.py +++ b/wagtail/documents/blocks.py @@ -9,12 +9,12 @@ from wagtail.core.blocks import ChooserBlock class DocumentChooserBlock(ChooserBlock): @cached_property def target_model(self): - from wagtail.wagtaildocs.models import get_document_model + from wagtail.documents.models import get_document_model return get_document_model() @cached_property def widget(self): - from wagtail.wagtaildocs.widgets import AdminDocumentChooser + from wagtail.documents.widgets import AdminDocumentChooser return AdminDocumentChooser def render_basic(self, value, context=None): diff --git a/wagtail/wagtaildocs/edit_handlers.py b/wagtail/documents/edit_handlers.py similarity index 100% rename from wagtail/wagtaildocs/edit_handlers.py rename to wagtail/documents/edit_handlers.py diff --git a/wagtail/wagtaildocs/forms.py b/wagtail/documents/forms.py similarity index 92% rename from wagtail/wagtaildocs/forms.py rename to wagtail/documents/forms.py index 920437ad6a..0cb10ac73b 100644 --- a/wagtail/wagtaildocs/forms.py +++ b/wagtail/documents/forms.py @@ -7,8 +7,8 @@ from django.utils.translation import ugettext_lazy as _ from wagtail.admin import widgets from wagtail.admin.forms import ( BaseCollectionMemberForm, collection_member_permission_formset_factory) -from wagtail.wagtaildocs.models import Document -from wagtail.wagtaildocs.permissions import permission_policy as documents_permission_policy +from wagtail.documents.models import Document +from wagtail.documents.permissions import permission_policy as documents_permission_policy class BaseDocumentForm(BaseCollectionMemberForm): diff --git a/wagtail/wagtaildocs/locale/ar/LC_MESSAGES/django.mo b/wagtail/documents/locale/ar/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/ar/LC_MESSAGES/django.mo rename to wagtail/documents/locale/ar/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/ar/LC_MESSAGES/django.po b/wagtail/documents/locale/ar/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/ar/LC_MESSAGES/django.po rename to wagtail/documents/locale/ar/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/bg/LC_MESSAGES/django.mo b/wagtail/documents/locale/bg/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/bg/LC_MESSAGES/django.mo rename to wagtail/documents/locale/bg/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/bg/LC_MESSAGES/django.po b/wagtail/documents/locale/bg/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/bg/LC_MESSAGES/django.po rename to wagtail/documents/locale/bg/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/ca/LC_MESSAGES/django.mo b/wagtail/documents/locale/ca/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/ca/LC_MESSAGES/django.mo rename to wagtail/documents/locale/ca/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/ca/LC_MESSAGES/django.po b/wagtail/documents/locale/ca/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/ca/LC_MESSAGES/django.po rename to wagtail/documents/locale/ca/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/cs/LC_MESSAGES/django.mo b/wagtail/documents/locale/cs/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/cs/LC_MESSAGES/django.mo rename to wagtail/documents/locale/cs/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/cs/LC_MESSAGES/django.po b/wagtail/documents/locale/cs/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/cs/LC_MESSAGES/django.po rename to wagtail/documents/locale/cs/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/de/LC_MESSAGES/django.mo b/wagtail/documents/locale/de/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/de/LC_MESSAGES/django.mo rename to wagtail/documents/locale/de/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/de/LC_MESSAGES/django.po b/wagtail/documents/locale/de/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/de/LC_MESSAGES/django.po rename to wagtail/documents/locale/de/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/el/LC_MESSAGES/django.mo b/wagtail/documents/locale/el/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/el/LC_MESSAGES/django.mo rename to wagtail/documents/locale/el/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/el/LC_MESSAGES/django.po b/wagtail/documents/locale/el/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/el/LC_MESSAGES/django.po rename to wagtail/documents/locale/el/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/en/LC_MESSAGES/django.mo b/wagtail/documents/locale/en/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/en/LC_MESSAGES/django.mo rename to wagtail/documents/locale/en/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/en/LC_MESSAGES/django.po b/wagtail/documents/locale/en/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/en/LC_MESSAGES/django.po rename to wagtail/documents/locale/en/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/es/LC_MESSAGES/django.mo b/wagtail/documents/locale/es/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/es/LC_MESSAGES/django.mo rename to wagtail/documents/locale/es/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/es/LC_MESSAGES/django.po b/wagtail/documents/locale/es/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/es/LC_MESSAGES/django.po rename to wagtail/documents/locale/es/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/fa/LC_MESSAGES/django.mo b/wagtail/documents/locale/fa/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/fa/LC_MESSAGES/django.mo rename to wagtail/documents/locale/fa/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/fa/LC_MESSAGES/django.po b/wagtail/documents/locale/fa/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/fa/LC_MESSAGES/django.po rename to wagtail/documents/locale/fa/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/fi/LC_MESSAGES/django.mo b/wagtail/documents/locale/fi/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/fi/LC_MESSAGES/django.mo rename to wagtail/documents/locale/fi/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/fi/LC_MESSAGES/django.po b/wagtail/documents/locale/fi/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/fi/LC_MESSAGES/django.po rename to wagtail/documents/locale/fi/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/fr/LC_MESSAGES/django.mo b/wagtail/documents/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/fr/LC_MESSAGES/django.mo rename to wagtail/documents/locale/fr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/fr/LC_MESSAGES/django.po b/wagtail/documents/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/fr/LC_MESSAGES/django.po rename to wagtail/documents/locale/fr/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/gl/LC_MESSAGES/django.mo b/wagtail/documents/locale/gl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/gl/LC_MESSAGES/django.mo rename to wagtail/documents/locale/gl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/gl/LC_MESSAGES/django.po b/wagtail/documents/locale/gl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/gl/LC_MESSAGES/django.po rename to wagtail/documents/locale/gl/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/he_IL/LC_MESSAGES/django.mo b/wagtail/documents/locale/he_IL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/he_IL/LC_MESSAGES/django.mo rename to wagtail/documents/locale/he_IL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/he_IL/LC_MESSAGES/django.po b/wagtail/documents/locale/he_IL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/he_IL/LC_MESSAGES/django.po rename to wagtail/documents/locale/he_IL/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/hu/LC_MESSAGES/django.mo b/wagtail/documents/locale/hu/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/hu/LC_MESSAGES/django.mo rename to wagtail/documents/locale/hu/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/hu/LC_MESSAGES/django.po b/wagtail/documents/locale/hu/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/hu/LC_MESSAGES/django.po rename to wagtail/documents/locale/hu/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/id_ID/LC_MESSAGES/django.mo b/wagtail/documents/locale/id_ID/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/id_ID/LC_MESSAGES/django.mo rename to wagtail/documents/locale/id_ID/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/id_ID/LC_MESSAGES/django.po b/wagtail/documents/locale/id_ID/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/id_ID/LC_MESSAGES/django.po rename to wagtail/documents/locale/id_ID/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/is_IS/LC_MESSAGES/django.mo b/wagtail/documents/locale/is_IS/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/is_IS/LC_MESSAGES/django.mo rename to wagtail/documents/locale/is_IS/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/is_IS/LC_MESSAGES/django.po b/wagtail/documents/locale/is_IS/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/is_IS/LC_MESSAGES/django.po rename to wagtail/documents/locale/is_IS/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/it/LC_MESSAGES/django.mo b/wagtail/documents/locale/it/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/it/LC_MESSAGES/django.mo rename to wagtail/documents/locale/it/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/it/LC_MESSAGES/django.po b/wagtail/documents/locale/it/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/it/LC_MESSAGES/django.po rename to wagtail/documents/locale/it/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/ja/LC_MESSAGES/django.mo b/wagtail/documents/locale/ja/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/ja/LC_MESSAGES/django.mo rename to wagtail/documents/locale/ja/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/ja/LC_MESSAGES/django.po b/wagtail/documents/locale/ja/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/ja/LC_MESSAGES/django.po rename to wagtail/documents/locale/ja/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/ka/LC_MESSAGES/django.mo b/wagtail/documents/locale/ka/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/ka/LC_MESSAGES/django.mo rename to wagtail/documents/locale/ka/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/ka/LC_MESSAGES/django.po b/wagtail/documents/locale/ka/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/ka/LC_MESSAGES/django.po rename to wagtail/documents/locale/ka/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/ko/LC_MESSAGES/django.mo b/wagtail/documents/locale/ko/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/ko/LC_MESSAGES/django.mo rename to wagtail/documents/locale/ko/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/ko/LC_MESSAGES/django.po b/wagtail/documents/locale/ko/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/ko/LC_MESSAGES/django.po rename to wagtail/documents/locale/ko/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/lt/LC_MESSAGES/django.mo b/wagtail/documents/locale/lt/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/lt/LC_MESSAGES/django.mo rename to wagtail/documents/locale/lt/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/lt/LC_MESSAGES/django.po b/wagtail/documents/locale/lt/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/lt/LC_MESSAGES/django.po rename to wagtail/documents/locale/lt/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/lv/LC_MESSAGES/django.mo b/wagtail/documents/locale/lv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/lv/LC_MESSAGES/django.mo rename to wagtail/documents/locale/lv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/lv/LC_MESSAGES/django.po b/wagtail/documents/locale/lv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/lv/LC_MESSAGES/django.po rename to wagtail/documents/locale/lv/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/nb/LC_MESSAGES/django.mo b/wagtail/documents/locale/nb/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/nb/LC_MESSAGES/django.mo rename to wagtail/documents/locale/nb/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/nb/LC_MESSAGES/django.po b/wagtail/documents/locale/nb/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/nb/LC_MESSAGES/django.po rename to wagtail/documents/locale/nb/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/nl/LC_MESSAGES/django.mo b/wagtail/documents/locale/nl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/nl/LC_MESSAGES/django.mo rename to wagtail/documents/locale/nl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/nl/LC_MESSAGES/django.po b/wagtail/documents/locale/nl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/nl/LC_MESSAGES/django.po rename to wagtail/documents/locale/nl/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/nl_NL/LC_MESSAGES/django.mo b/wagtail/documents/locale/nl_NL/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/nl_NL/LC_MESSAGES/django.mo rename to wagtail/documents/locale/nl_NL/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/nl_NL/LC_MESSAGES/django.po b/wagtail/documents/locale/nl_NL/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/nl_NL/LC_MESSAGES/django.po rename to wagtail/documents/locale/nl_NL/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/pl/LC_MESSAGES/django.mo b/wagtail/documents/locale/pl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/pl/LC_MESSAGES/django.mo rename to wagtail/documents/locale/pl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/pl/LC_MESSAGES/django.po b/wagtail/documents/locale/pl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/pl/LC_MESSAGES/django.po rename to wagtail/documents/locale/pl/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/pt_BR/LC_MESSAGES/django.mo b/wagtail/documents/locale/pt_BR/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/pt_BR/LC_MESSAGES/django.mo rename to wagtail/documents/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/pt_BR/LC_MESSAGES/django.po b/wagtail/documents/locale/pt_BR/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/pt_BR/LC_MESSAGES/django.po rename to wagtail/documents/locale/pt_BR/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/pt_PT/LC_MESSAGES/django.mo b/wagtail/documents/locale/pt_PT/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/pt_PT/LC_MESSAGES/django.mo rename to wagtail/documents/locale/pt_PT/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/pt_PT/LC_MESSAGES/django.po b/wagtail/documents/locale/pt_PT/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/pt_PT/LC_MESSAGES/django.po rename to wagtail/documents/locale/pt_PT/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/ro/LC_MESSAGES/django.mo b/wagtail/documents/locale/ro/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/ro/LC_MESSAGES/django.mo rename to wagtail/documents/locale/ro/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/ro/LC_MESSAGES/django.po b/wagtail/documents/locale/ro/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/ro/LC_MESSAGES/django.po rename to wagtail/documents/locale/ro/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/ru/LC_MESSAGES/django.mo b/wagtail/documents/locale/ru/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/ru/LC_MESSAGES/django.mo rename to wagtail/documents/locale/ru/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/ru/LC_MESSAGES/django.po b/wagtail/documents/locale/ru/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/ru/LC_MESSAGES/django.po rename to wagtail/documents/locale/ru/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/sk_SK/LC_MESSAGES/django.mo b/wagtail/documents/locale/sk_SK/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/sk_SK/LC_MESSAGES/django.mo rename to wagtail/documents/locale/sk_SK/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/sk_SK/LC_MESSAGES/django.po b/wagtail/documents/locale/sk_SK/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/sk_SK/LC_MESSAGES/django.po rename to wagtail/documents/locale/sk_SK/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/sl/LC_MESSAGES/django.mo b/wagtail/documents/locale/sl/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/sl/LC_MESSAGES/django.mo rename to wagtail/documents/locale/sl/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/sl/LC_MESSAGES/django.po b/wagtail/documents/locale/sl/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/sl/LC_MESSAGES/django.po rename to wagtail/documents/locale/sl/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/sv/LC_MESSAGES/django.mo b/wagtail/documents/locale/sv/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/sv/LC_MESSAGES/django.mo rename to wagtail/documents/locale/sv/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/sv/LC_MESSAGES/django.po b/wagtail/documents/locale/sv/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/sv/LC_MESSAGES/django.po rename to wagtail/documents/locale/sv/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/tr/LC_MESSAGES/django.mo b/wagtail/documents/locale/tr/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/tr/LC_MESSAGES/django.mo rename to wagtail/documents/locale/tr/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/tr/LC_MESSAGES/django.po b/wagtail/documents/locale/tr/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/tr/LC_MESSAGES/django.po rename to wagtail/documents/locale/tr/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/zh/LC_MESSAGES/django.mo b/wagtail/documents/locale/zh/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/zh/LC_MESSAGES/django.mo rename to wagtail/documents/locale/zh/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/zh/LC_MESSAGES/django.po b/wagtail/documents/locale/zh/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/zh/LC_MESSAGES/django.po rename to wagtail/documents/locale/zh/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/locale/zh_CN/LC_MESSAGES/django.mo b/wagtail/documents/locale/zh_CN/LC_MESSAGES/django.mo similarity index 100% rename from wagtail/wagtaildocs/locale/zh_CN/LC_MESSAGES/django.mo rename to wagtail/documents/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/wagtail/wagtaildocs/locale/zh_CN/LC_MESSAGES/django.po b/wagtail/documents/locale/zh_CN/LC_MESSAGES/django.po similarity index 100% rename from wagtail/wagtaildocs/locale/zh_CN/LC_MESSAGES/django.po rename to wagtail/documents/locale/zh_CN/LC_MESSAGES/django.po diff --git a/wagtail/wagtaildocs/migrations/0001_initial.py b/wagtail/documents/migrations/0001_initial.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0001_initial.py rename to wagtail/documents/migrations/0001_initial.py diff --git a/wagtail/wagtaildocs/migrations/0002_initial_data.py b/wagtail/documents/migrations/0002_initial_data.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0002_initial_data.py rename to wagtail/documents/migrations/0002_initial_data.py diff --git a/wagtail/wagtaildocs/migrations/0003_add_verbose_names.py b/wagtail/documents/migrations/0003_add_verbose_names.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0003_add_verbose_names.py rename to wagtail/documents/migrations/0003_add_verbose_names.py diff --git a/wagtail/wagtaildocs/migrations/0004_capitalizeverbose.py b/wagtail/documents/migrations/0004_capitalizeverbose.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0004_capitalizeverbose.py rename to wagtail/documents/migrations/0004_capitalizeverbose.py diff --git a/wagtail/wagtaildocs/migrations/0005_alter_uploaded_by_user_on_delete_action.py b/wagtail/documents/migrations/0005_alter_uploaded_by_user_on_delete_action.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0005_alter_uploaded_by_user_on_delete_action.py rename to wagtail/documents/migrations/0005_alter_uploaded_by_user_on_delete_action.py diff --git a/wagtail/wagtaildocs/migrations/0005_document_collection.py b/wagtail/documents/migrations/0005_document_collection.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0005_document_collection.py rename to wagtail/documents/migrations/0005_document_collection.py diff --git a/wagtail/wagtaildocs/migrations/0006_copy_document_permissions_to_collections.py b/wagtail/documents/migrations/0006_copy_document_permissions_to_collections.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0006_copy_document_permissions_to_collections.py rename to wagtail/documents/migrations/0006_copy_document_permissions_to_collections.py diff --git a/wagtail/wagtaildocs/migrations/0007_merge.py b/wagtail/documents/migrations/0007_merge.py similarity index 100% rename from wagtail/wagtaildocs/migrations/0007_merge.py rename to wagtail/documents/migrations/0007_merge.py diff --git a/wagtail/wagtaildocs/migrations/__init__.py b/wagtail/documents/migrations/__init__.py similarity index 100% rename from wagtail/wagtaildocs/migrations/__init__.py rename to wagtail/documents/migrations/__init__.py diff --git a/wagtail/wagtaildocs/models.py b/wagtail/documents/models.py similarity index 95% rename from wagtail/wagtaildocs/models.py rename to wagtail/documents/models.py index 1bf39e6a0e..4140ba4fe3 100644 --- a/wagtail/wagtaildocs/models.py +++ b/wagtail/documents/models.py @@ -69,7 +69,7 @@ class AbstractDocument(CollectionMember, index.Indexed, models.Model): args=(self.id,)) def is_editable_by_user(self, user): - from wagtail.wagtaildocs.permissions import permission_policy + from wagtail.documents.permissions import permission_policy return permission_policy.user_has_permission_for_instance(user, 'change', self) class Meta: @@ -89,7 +89,7 @@ class Document(AbstractDocument): def get_document_model(): """ Get the document model from the ``WAGTAILDOCS_DOCUMENT_MODEL`` setting. - Defauts to the standard :class:`~wagtail.wagtaildocs.models.Document` model + Defauts to the standard :class:`~wagtail.documents.models.Document` model if no custom model is defined. """ from django.conf import settings diff --git a/wagtail/wagtaildocs/permissions.py b/wagtail/documents/permissions.py similarity index 81% rename from wagtail/wagtaildocs/permissions.py rename to wagtail/documents/permissions.py index f3fcd5e358..34cffaad95 100644 --- a/wagtail/wagtaildocs/permissions.py +++ b/wagtail/documents/permissions.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals from wagtail.core.permission_policies.collections import CollectionOwnershipPermissionPolicy -from wagtail.wagtaildocs.models import Document, get_document_model +from wagtail.documents.models import Document, get_document_model permission_policy = CollectionOwnershipPermissionPolicy( get_document_model(), diff --git a/wagtail/wagtaildocs/rich_text.py b/wagtail/documents/rich_text.py similarity index 92% rename from wagtail/wagtaildocs/rich_text.py rename to wagtail/documents/rich_text.py index 7991b97702..1a9f86243c 100644 --- a/wagtail/wagtaildocs/rich_text.py +++ b/wagtail/documents/rich_text.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.html import escape -from wagtail.wagtaildocs.models import get_document_model +from wagtail.documents.models import get_document_model class DocumentLinkHandler(object): diff --git a/wagtail/wagtaildocs/signal_handlers.py b/wagtail/documents/signal_handlers.py similarity index 88% rename from wagtail/wagtaildocs/signal_handlers.py rename to wagtail/documents/signal_handlers.py index a8bb3f0c20..a3d54a90b6 100644 --- a/wagtail/wagtaildocs/signal_handlers.py +++ b/wagtail/documents/signal_handlers.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.db import transaction from django.db.models.signals import post_delete -from wagtail.wagtaildocs.models import get_document_model +from wagtail.documents.models import get_document_model def post_delete_file_cleanup(instance, **kwargs): diff --git a/wagtail/wagtaildocs/static_src/wagtaildocs/js/add-multiple.js b/wagtail/documents/static_src/wagtaildocs/js/add-multiple.js similarity index 100% rename from wagtail/wagtaildocs/static_src/wagtaildocs/js/add-multiple.js rename to wagtail/documents/static_src/wagtaildocs/js/add-multiple.js diff --git a/wagtail/wagtaildocs/static_src/wagtaildocs/js/document-chooser.js b/wagtail/documents/static_src/wagtaildocs/js/document-chooser.js similarity index 100% rename from wagtail/wagtaildocs/static_src/wagtaildocs/js/document-chooser.js rename to wagtail/documents/static_src/wagtaildocs/js/document-chooser.js diff --git a/wagtail/wagtaildocs/static_src/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js b/wagtail/documents/static_src/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js similarity index 100% rename from wagtail/wagtaildocs/static_src/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js rename to wagtail/documents/static_src/wagtaildocs/js/hallo-plugins/hallo-wagtaildoclink.js diff --git a/wagtail/wagtaildocs/static_src/wagtaildocs/scss/add-multiple.scss b/wagtail/documents/static_src/wagtaildocs/scss/add-multiple.scss similarity index 100% rename from wagtail/wagtaildocs/static_src/wagtaildocs/scss/add-multiple.scss rename to wagtail/documents/static_src/wagtaildocs/scss/add-multiple.scss diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html b/wagtail/documents/templates/wagtaildocs/chooser/chooser.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.html rename to wagtail/documents/templates/wagtaildocs/chooser/chooser.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.js b/wagtail/documents/templates/wagtaildocs/chooser/chooser.js similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/chooser/chooser.js rename to wagtail/documents/templates/wagtaildocs/chooser/chooser.js diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/document_chosen.js b/wagtail/documents/templates/wagtaildocs/chooser/document_chosen.js similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/chooser/document_chosen.js rename to wagtail/documents/templates/wagtaildocs/chooser/document_chosen.js diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/chooser/results.html b/wagtail/documents/templates/wagtaildocs/chooser/results.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/chooser/results.html rename to wagtail/documents/templates/wagtaildocs/chooser/results.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field.html b/wagtail/documents/templates/wagtaildocs/documents/_file_field.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field.html rename to wagtail/documents/templates/wagtaildocs/documents/_file_field.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field_as_li.html b/wagtail/documents/templates/wagtaildocs/documents/_file_field_as_li.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/_file_field_as_li.html rename to wagtail/documents/templates/wagtaildocs/documents/_file_field_as_li.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html b/wagtail/documents/templates/wagtaildocs/documents/add.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/add.html rename to wagtail/documents/templates/wagtaildocs/documents/add.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html b/wagtail/documents/templates/wagtaildocs/documents/confirm_delete.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/confirm_delete.html rename to wagtail/documents/templates/wagtaildocs/documents/confirm_delete.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/documents/templates/wagtaildocs/documents/edit.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html rename to wagtail/documents/templates/wagtaildocs/documents/edit.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html b/wagtail/documents/templates/wagtaildocs/documents/index.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/index.html rename to wagtail/documents/templates/wagtaildocs/documents/index.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html b/wagtail/documents/templates/wagtaildocs/documents/list.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html rename to wagtail/documents/templates/wagtaildocs/documents/list.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/results.html b/wagtail/documents/templates/wagtaildocs/documents/results.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/results.html rename to wagtail/documents/templates/wagtaildocs/documents/results.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/usage.html b/wagtail/documents/templates/wagtaildocs/documents/usage.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/documents/usage.html rename to wagtail/documents/templates/wagtaildocs/documents/usage.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/edit_handlers/document_chooser_panel.html b/wagtail/documents/templates/wagtaildocs/edit_handlers/document_chooser_panel.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/edit_handlers/document_chooser_panel.html rename to wagtail/documents/templates/wagtaildocs/edit_handlers/document_chooser_panel.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/homepage/site_summary_documents.html b/wagtail/documents/templates/wagtaildocs/homepage/site_summary_documents.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/homepage/site_summary_documents.html rename to wagtail/documents/templates/wagtaildocs/homepage/site_summary_documents.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/multiple/add.html b/wagtail/documents/templates/wagtaildocs/multiple/add.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/multiple/add.html rename to wagtail/documents/templates/wagtaildocs/multiple/add.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/multiple/edit_form.html b/wagtail/documents/templates/wagtaildocs/multiple/edit_form.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/multiple/edit_form.html rename to wagtail/documents/templates/wagtaildocs/multiple/edit_form.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/password_required.html b/wagtail/documents/templates/wagtaildocs/password_required.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/password_required.html rename to wagtail/documents/templates/wagtaildocs/password_required.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/permissions/includes/document_permissions_formset.html b/wagtail/documents/templates/wagtaildocs/permissions/includes/document_permissions_formset.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/permissions/includes/document_permissions_formset.html rename to wagtail/documents/templates/wagtaildocs/permissions/includes/document_permissions_formset.html diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/widgets/document_chooser.html b/wagtail/documents/templates/wagtaildocs/widgets/document_chooser.html similarity index 100% rename from wagtail/wagtaildocs/templates/wagtaildocs/widgets/document_chooser.html rename to wagtail/documents/templates/wagtaildocs/widgets/document_chooser.html diff --git a/wagtail/wagtaildocs/tests/__init__.py b/wagtail/documents/tests/__init__.py similarity index 100% rename from wagtail/wagtaildocs/tests/__init__.py rename to wagtail/documents/tests/__init__.py diff --git a/wagtail/wagtaildocs/tests/test_admin_views.py b/wagtail/documents/tests/test_admin_views.py similarity index 99% rename from wagtail/wagtaildocs/tests/test_admin_views.py rename to wagtail/documents/tests/test_admin_views.py index 7e94bf08c5..c38bd9cc47 100644 --- a/wagtail/wagtaildocs/tests/test_admin_views.py +++ b/wagtail/documents/tests/test_admin_views.py @@ -14,7 +14,7 @@ from django.utils.six import b from wagtail.tests.testapp.models import EventPage, EventPageRelatedLink from wagtail.tests.utils import WagtailTestUtils from wagtail.core.models import Collection, GroupCollectionPermission, Page -from wagtail.wagtaildocs import models +from wagtail.documents import models class TestDocumentIndexView(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtaildocs/tests/test_collection_privacy.py b/wagtail/documents/tests/test_collection_privacy.py similarity index 98% rename from wagtail/wagtaildocs/tests/test_collection_privacy.py rename to wagtail/documents/tests/test_collection_privacy.py index a0915ef24d..811971b7ae 100644 --- a/wagtail/wagtaildocs/tests/test_collection_privacy.py +++ b/wagtail/documents/tests/test_collection_privacy.py @@ -7,7 +7,7 @@ from django.urls import reverse from django.utils.six import b from wagtail.core.models import Collection, CollectionViewRestriction -from wagtail.wagtaildocs.models import Document +from wagtail.documents.models import Document try: from urllib.parse import quote diff --git a/wagtail/wagtaildocs/tests/test_models.py b/wagtail/documents/tests/test_models.py similarity index 98% rename from wagtail/wagtaildocs/tests/test_models.py rename to wagtail/documents/tests/test_models.py index c89c9947dd..0d5ec231e7 100644 --- a/wagtail/wagtaildocs/tests/test_models.py +++ b/wagtail/documents/tests/test_models.py @@ -8,8 +8,8 @@ from django.test import TestCase, TransactionTestCase from django.test.utils import override_settings from wagtail.core.models import Collection, GroupCollectionPermission -from wagtail.wagtaildocs import models, signal_handlers -from wagtail.wagtaildocs.models import get_document_model +from wagtail.documents import models, signal_handlers +from wagtail.documents.models import get_document_model from wagtail.wagtailimages.tests.utils import get_test_image_file diff --git a/wagtail/wagtaildocs/tests/test_rich_text.py b/wagtail/documents/tests/test_rich_text.py similarity index 95% rename from wagtail/wagtaildocs/tests/test_rich_text.py rename to wagtail/documents/tests/test_rich_text.py index 630bc11fbb..23ba00ffe9 100644 --- a/wagtail/wagtaildocs/tests/test_rich_text.py +++ b/wagtail/documents/tests/test_rich_text.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from bs4 import BeautifulSoup from django.test import TestCase -from wagtail.wagtaildocs.rich_text import DocumentLinkHandler +from wagtail.documents.rich_text import DocumentLinkHandler class TestDocumentRichTextLinkHandler(TestCase): diff --git a/wagtail/wagtaildocs/tests/test_search.py b/wagtail/documents/tests/test_search.py similarity index 99% rename from wagtail/wagtaildocs/tests/test_search.py rename to wagtail/documents/tests/test_search.py index 44851c84ba..d440aaeb6b 100644 --- a/wagtail/wagtaildocs/tests/test_search.py +++ b/wagtail/documents/tests/test_search.py @@ -9,7 +9,7 @@ from django.urls import reverse from django.utils.six import b from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtaildocs import models +from wagtail.documents import models @override_settings(_WAGTAILSEARCH_FORCE_AUTO_UPDATE=['elasticsearch']) diff --git a/wagtail/wagtaildocs/tests/test_views.py b/wagtail/documents/tests/test_views.py similarity index 99% rename from wagtail/wagtaildocs/tests/test_views.py rename to wagtail/documents/tests/test_views.py index d072b5ef0f..4d79ab4232 100644 --- a/wagtail/wagtaildocs/tests/test_views.py +++ b/wagtail/documents/tests/test_views.py @@ -12,7 +12,7 @@ from django.test.utils import override_settings from django.urls import reverse from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtaildocs import models +from wagtail.documents import models class TestEditView(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtaildocs/urls.py b/wagtail/documents/urls.py similarity index 87% rename from wagtail/wagtaildocs/urls.py rename to wagtail/documents/urls.py index cb30301634..1f3df6ca2a 100644 --- a/wagtail/wagtaildocs/urls.py +++ b/wagtail/documents/urls.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.conf.urls import url -from wagtail.wagtaildocs.views import serve +from wagtail.documents.views import serve urlpatterns = [ url(r'^(\d+)/(.*)$', serve.serve, name='wagtaildocs_serve'), diff --git a/wagtail/wagtaildocs/views/__init__.py b/wagtail/documents/views/__init__.py similarity index 100% rename from wagtail/wagtaildocs/views/__init__.py rename to wagtail/documents/views/__init__.py diff --git a/wagtail/wagtaildocs/views/chooser.py b/wagtail/documents/views/chooser.py similarity index 95% rename from wagtail/wagtaildocs/views/chooser.py rename to wagtail/documents/views/chooser.py index 51f754f84d..4802208743 100644 --- a/wagtail/wagtaildocs/views/chooser.py +++ b/wagtail/documents/views/chooser.py @@ -11,9 +11,9 @@ from wagtail.admin.modal_workflow import render_modal_workflow from wagtail.admin.utils import PermissionPolicyChecker from wagtail.core import hooks from wagtail.core.models import Collection -from wagtail.wagtaildocs.forms import get_document_form -from wagtail.wagtaildocs.models import get_document_model -from wagtail.wagtaildocs.permissions import permission_policy +from wagtail.documents.forms import get_document_form +from wagtail.documents.models import get_document_model +from wagtail.documents.permissions import permission_policy from wagtail.wagtailsearch import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/wagtaildocs/views/documents.py b/wagtail/documents/views/documents.py similarity index 97% rename from wagtail/wagtaildocs/views/documents.py rename to wagtail/documents/views/documents.py index c8b5826f98..1df24eff50 100644 --- a/wagtail/wagtaildocs/views/documents.py +++ b/wagtail/documents/views/documents.py @@ -11,9 +11,9 @@ from wagtail.admin.forms import SearchForm from wagtail.admin.utils import ( PermissionPolicyChecker, permission_denied, popular_tags_for_model) from wagtail.core.models import Collection -from wagtail.wagtaildocs.forms import get_document_form -from wagtail.wagtaildocs.models import get_document_model -from wagtail.wagtaildocs.permissions import permission_policy +from wagtail.documents.forms import get_document_form +from wagtail.documents.models import get_document_model +from wagtail.documents.permissions import permission_policy from wagtail.wagtailsearch import index as search_index permission_checker = PermissionPolicyChecker(permission_policy) diff --git a/wagtail/wagtaildocs/views/multiple.py b/wagtail/documents/views/multiple.py similarity index 100% rename from wagtail/wagtaildocs/views/multiple.py rename to wagtail/documents/views/multiple.py diff --git a/wagtail/wagtaildocs/views/serve.py b/wagtail/documents/views/serve.py similarity index 98% rename from wagtail/wagtaildocs/views/serve.py rename to wagtail/documents/views/serve.py index da55aade35..70756aa49a 100644 --- a/wagtail/wagtaildocs/views/serve.py +++ b/wagtail/documents/views/serve.py @@ -13,7 +13,7 @@ from wagtail.utils.sendfile import sendfile from wagtail.core import hooks from wagtail.core.forms import PasswordViewRestrictionForm from wagtail.core.models import CollectionViewRestriction -from wagtail.wagtaildocs.models import document_served, get_document_model +from wagtail.documents.models import document_served, get_document_model def serve(request, document_id, document_filename): diff --git a/wagtail/wagtaildocs/wagtail_hooks.py b/wagtail/documents/wagtail_hooks.py similarity index 93% rename from wagtail/wagtaildocs/wagtail_hooks.py rename to wagtail/documents/wagtail_hooks.py index 450aa8da98..1711de62e4 100644 --- a/wagtail/wagtaildocs/wagtail_hooks.py +++ b/wagtail/documents/wagtail_hooks.py @@ -16,12 +16,12 @@ from wagtail.admin.site_summary import SummaryItem from wagtail.core import hooks from wagtail.core.models import BaseViewRestriction from wagtail.core.wagtail_hooks import require_wagtail_login -from wagtail.wagtaildocs import admin_urls -from wagtail.wagtaildocs.api.admin.endpoints import DocumentsAdminAPIEndpoint -from wagtail.wagtaildocs.forms import GroupDocumentPermissionFormSet -from wagtail.wagtaildocs.models import get_document_model -from wagtail.wagtaildocs.permissions import permission_policy -from wagtail.wagtaildocs.rich_text import DocumentLinkHandler +from wagtail.documents import admin_urls +from wagtail.documents.api.admin.endpoints import DocumentsAdminAPIEndpoint +from wagtail.documents.forms import GroupDocumentPermissionFormSet +from wagtail.documents.models import get_document_model +from wagtail.documents.permissions import permission_policy +from wagtail.documents.rich_text import DocumentLinkHandler @hooks.register('register_admin_urls') diff --git a/wagtail/wagtaildocs/widgets.py b/wagtail/documents/widgets.py similarity index 95% rename from wagtail/wagtaildocs/widgets.py rename to wagtail/documents/widgets.py index 786ffbc6cc..c381083cc3 100644 --- a/wagtail/wagtaildocs/widgets.py +++ b/wagtail/documents/widgets.py @@ -6,7 +6,7 @@ from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from wagtail.admin.widgets import AdminChooser -from wagtail.wagtaildocs.models import get_document_model +from wagtail.documents.models import get_document_model class AdminDocumentChooser(AdminChooser): diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index d20faaba27..336a4849f0 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -35,7 +35,7 @@ INSTALLED_APPS = [ 'wagtail.wagtailsites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', - 'wagtail.wagtaildocs', + 'wagtail.documents', 'wagtail.wagtailimages', 'wagtail.wagtailsearch', 'wagtail.admin', diff --git a/wagtail/project_template/project_name/urls.py b/wagtail/project_template/project_name/urls.py index db387e458a..a4ab11bb17 100644 --- a/wagtail/project_template/project_name/urls.py +++ b/wagtail/project_template/project_name/urls.py @@ -6,7 +6,7 @@ from django.contrib import admin from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls -from wagtail.wagtaildocs import urls as wagtaildocs_urls +from wagtail.documents import urls as wagtaildocs_urls from search import views as search_views diff --git a/wagtail/tests/demosite/models.py b/wagtail/tests/demosite/models.py index e027405a99..e8aed7743e 100644 --- a/wagtail/tests/demosite/models.py +++ b/wagtail/tests/demosite/models.py @@ -13,7 +13,7 @@ from wagtail.admin.edit_handlers import ( FieldPanel, InlinePanel, MultiFieldPanel, PageChooserPanel) from wagtail.core.fields import RichTextField from wagtail.core.models import Orderable, Page -from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel +from wagtail.documents.edit_handlers import DocumentChooserPanel from wagtail.wagtailimages.api.fields import ImageRenditionField from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtailsearch import index diff --git a/wagtail/tests/non_root_urls.py b/wagtail/tests/non_root_urls.py index 50683a41b3..7b761188ff 100644 --- a/wagtail/tests/non_root_urls.py +++ b/wagtail/tests/non_root_urls.py @@ -7,7 +7,7 @@ from django.conf.urls import include, url from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls -from wagtail.wagtaildocs import urls as wagtaildocs_urls +from wagtail.documents import urls as wagtaildocs_urls from wagtail.wagtailimages import urls as wagtailimages_urls from wagtail.wagtailsearch import urls as wagtailsearch_urls diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index a5434f8c7e..431e39e1de 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -125,7 +125,7 @@ INSTALLED_APPS = ( 'wagtail.wagtailsites', 'wagtail.wagtailusers', 'wagtail.wagtailsnippets', - 'wagtail.wagtaildocs', + 'wagtail.documents', 'wagtail.admin', 'wagtail.api.v2', 'wagtail.core', diff --git a/wagtail/tests/testapp/models.py b/wagtail/tests/testapp/models.py index e2fe27f9dd..6683185f3a 100644 --- a/wagtail/tests/testapp/models.py +++ b/wagtail/tests/testapp/models.py @@ -27,8 +27,8 @@ from wagtail.admin.utils import send_mail from wagtail.core.blocks import CharBlock, RichTextBlock from wagtail.core.fields import RichTextField, StreamField from wagtail.core.models import Orderable, Page, PageManager, PageQuerySet -from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel -from wagtail.wagtaildocs.models import AbstractDocument, Document +from wagtail.documents.edit_handlers import DocumentChooserPanel +from wagtail.documents.models import AbstractDocument, Document from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField, AbstractFormSubmission from wagtail.wagtailimages.blocks import ImageChooserBlock from wagtail.wagtailimages.edit_handlers import ImageChooserPanel diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index 5cfaedb2df..e94e651661 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -9,8 +9,8 @@ from wagtail.contrib.wagtailsitemaps import Sitemap from wagtail.tests.testapp import urls as testapp_urls from wagtail.admin import urls as wagtailadmin_urls from wagtail.core import urls as wagtail_urls -from wagtail.wagtaildocs import urls as wagtaildocs_urls -from wagtail.wagtaildocs.api.v2.endpoints import DocumentsAPIEndpoint +from wagtail.documents import urls as wagtaildocs_urls +from wagtail.documents.api.v2.endpoints import DocumentsAPIEndpoint from wagtail.wagtailimages import urls as wagtailimages_urls from wagtail.wagtailimages.api.v2.endpoints import ImagesAPIEndpoint from wagtail.wagtailimages.tests import urls as wagtailimages_test_urls diff --git a/wagtail/wagtaildocs/__init__.py b/wagtail/wagtaildocs/__init__.py deleted file mode 100644 index 9c5f852400..0000000000 --- a/wagtail/wagtaildocs/__init__.py +++ /dev/null @@ -1 +0,0 @@ -default_app_config = 'wagtail.wagtaildocs.apps.WagtailDocsAppConfig'