diff --git a/client/src/entrypoints/documents/document-chooser-modal.js b/client/src/entrypoints/documents/document-chooser-modal.js index 186f279fa5..c87b00c9c0 100644 --- a/client/src/entrypoints/documents/document-chooser-modal.js +++ b/client/src/entrypoints/documents/document-chooser-modal.js @@ -58,8 +58,6 @@ class DocumentChooserModalOnloadHandlerFactory extends ChooserModalOnloadHandler window.DOCUMENT_CHOOSER_MODAL_ONLOAD_HANDLERS = new DocumentChooserModalOnloadHandlerFactory({ - chooseStepName: 'chooser', - chosenStepName: 'document_chosen', searchFormSelector: 'form.document-search', searchFilterSelectors: ['#collection_chooser_collection_id'], searchInputDelay: 50, diff --git a/wagtail/documents/tests/test_admin_views.py b/wagtail/documents/tests/test_admin_views.py index dd193be1e2..0394a14cd3 100644 --- a/wagtail/documents/tests/test_admin_views.py +++ b/wagtail/documents/tests/test_admin_views.py @@ -1418,7 +1418,7 @@ class TestDocumentChooserView(TestCase, WagtailTestUtils): self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, "wagtaildocs/chooser/chooser.html") response_json = json.loads(response.content.decode()) - self.assertEqual(response_json["step"], "chooser") + self.assertEqual(response_json["step"], "choose") # draftail should NOT be a standard JS include on this page self.assertNotIn("wagtailadmin/js/draftail.js", response_json["html"]) @@ -1437,7 +1437,7 @@ class TestDocumentChooserView(TestCase, WagtailTestUtils): response = self.client.get(reverse("wagtaildocs:chooser")) self.assertEqual(response.status_code, 200) response_json = json.loads(response.content.decode()) - self.assertEqual(response_json["step"], "chooser") + self.assertEqual(response_json["step"], "choose") self.assertTemplateUsed(response, "wagtaildocs/chooser/chooser.html") # custom form fields should be present @@ -1576,7 +1576,7 @@ class TestDocumentChooserChosenView(TestCase, WagtailTestUtils): ) self.assertEqual(response.status_code, 200) response_json = json.loads(response.content.decode()) - self.assertEqual(response_json["step"], "document_chosen") + self.assertEqual(response_json["step"], "chosen") class TestDocumentChooserUploadView(TestCase, WagtailTestUtils): @@ -1601,9 +1601,9 @@ class TestDocumentChooserUploadView(TestCase, WagtailTestUtils): } response = self.client.post(reverse("wagtaildocs:chooser_upload"), post_data) - # Check that the response is the 'document_chosen' step + # Check that the response is the 'chosen' step response_json = json.loads(response.content.decode()) - self.assertEqual(response_json["step"], "document_chosen") + self.assertEqual(response_json["step"], "chosen") # Document should be created self.assertTrue(models.Document.objects.filter(title="Test document").exists()) @@ -1681,7 +1681,7 @@ class TestDocumentChooserUploadViewWithLimitedPermissions(TestCase, WagtailTestU self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, "wagtaildocs/chooser/chooser.html") response_json = json.loads(response.content.decode()) - self.assertEqual(response_json["step"], "chooser") + self.assertEqual(response_json["step"], "choose") # user only has access to one collection -> should not see the collections field self.assertNotIn("id_collection", response_json["html"]) @@ -1697,9 +1697,9 @@ class TestDocumentChooserUploadViewWithLimitedPermissions(TestCase, WagtailTestU } response = self.client.post(reverse("wagtaildocs:chooser_upload"), post_data) - # Check that the response is the 'document_chosen' step + # Check that the response is the 'chosen' step response_json = json.loads(response.content.decode()) - self.assertEqual(response_json["step"], "document_chosen") + self.assertEqual(response_json["step"], "chosen") # Document should be created doc = models.Document.objects.filter(title="Test document") diff --git a/wagtail/documents/views/chooser.py b/wagtail/documents/views/chooser.py index 4b3bd1afc1..f2438af282 100644 --- a/wagtail/documents/views/chooser.py +++ b/wagtail/documents/views/chooser.py @@ -30,7 +30,7 @@ def get_document_chosen_response(request, document): None, None, json_data={ - "step": "document_chosen", + "step": "chosen", "result": { "id": document.id, "title": document.title, @@ -144,7 +144,7 @@ class ChooseView(BaseChooseView): None, self.get_context_data(), json_data={ - "step": "chooser", + "step": "choose", "tag_autocomplete_url": reverse("wagtailadmin_tag_autocomplete"), }, )