diff --git a/CHANGELOG.txt b/CHANGELOG.txt index db18f9ac2..e06b0470a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -24,6 +24,7 @@ Changelog * Tag input fields now accept spaces in tags by default, and can be overridden with the `TAG_SPACES_ALLOWED` setting (Kees Hink, Alex Gleason) * Page chooser widgets now display the required page type where relevant (Christine Ho) * Site root pages are now indicated with a globe icon in the explorer listing (Nick Smith, Huub Bouma) + * Draft page view is now restricted to users with edit / publish permission over the page (Kees Hink) * Fix: Marked 'Date from' / 'Date to' strings in wagtailforms for translation (Vorlif) * Fix: "File" field label on image edit form is now translated (Stein Strindhaug) * Fix: Unreliable preview is now reliable by always opening in a new window (Kjartan Sverrisson) diff --git a/docs/editor_manual/administrator_tasks/managing_users.rst b/docs/editor_manual/administrator_tasks/managing_users.rst index b6f70f9f7..fce7dcbd5 100644 --- a/docs/editor_manual/administrator_tasks/managing_users.rst +++ b/docs/editor_manual/administrator_tasks/managing_users.rst @@ -20,13 +20,13 @@ Clicking on a user's name will open their profile details. From here you can the Click the 'Roles' tab to edit the level of access your users have. By default there are three roles: -+--------------+--------------+-----------------+-----------------+ -| Role | Create drafts| Publish content | Access Settings | -+==============+==============+=================+=================+ -| Editor | Yes | No | No | -+--------------+--------------+-----------------+-----------------+ -| Moderator | Yes | Yes | No | -+--------------+--------------+-----------------+-----------------+ -| Administrator| Yes | Yes | Yes | -+--------------+--------------+-----------------+-----------------+ ++--------------+--------------------+-----------------+-----------------+ +| Role | Create/view drafts | Publish content | Access Settings | ++==============+====================+=================+=================+ +| Editor | Yes | No | No | ++--------------+--------------------+-----------------+-----------------+ +| Moderator | Yes | Yes | No | ++--------------+--------------------+-----------------+-----------------+ +| Administrator| Yes | Yes | Yes | ++--------------+--------------------+-----------------+-----------------+ diff --git a/docs/releases/1.10.rst b/docs/releases/1.10.rst index d8c818a48..7e9b65238 100644 --- a/docs/releases/1.10.rst +++ b/docs/releases/1.10.rst @@ -31,6 +31,7 @@ Other features * Tag input fields now accept spaces in tags by default, and can be overridden with the ``TAG_SPACES_ALLOWED`` setting (Kees Hink, Alex Gleason) * Page chooser widgets now display the required page type where relevant (Christine Ho) * Site root pages are now indicated with a globe icon in the explorer listing (Nick Smith, Huub Bouma) + * Draft page view is now restricted to users with edit / publish permission over the page (Kees Hink) Bug fixes diff --git a/docs/topics/permissions.rst b/docs/topics/permissions.rst index be6e97b51..517168d4d 100644 --- a/docs/topics/permissions.rst +++ b/docs/topics/permissions.rst @@ -31,6 +31,7 @@ The full set of available permission types is as follows: * **Bulk delete** - allows a user to delete pages that have descendants, in a single operation. Without this permission, a user has to delete the descendant pages individually before deleting the parent. This is a safeguard against accidental deletion. This permission must be used in conjunction with 'add' / 'edit' permission, as it does not provide any deletion rights of its own; it only provides a 'shortcut' for the permissions the user has already. For example, a user with just 'add' and 'bulk delete' permissions will only be able to bulk-delete if all the affected pages are owned by that user, and are unpublished. * **Lock** - grants the ability to lock or unlock this page (and any pages underneath it) for editing, preventing users from making any further edits to it. +Drafts can be viewed only if the user has either Edit or Publish permission. Image / document permissions ---------------------------- diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index c98f22db7..4aa750d99 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -4080,3 +4080,61 @@ class TestValidationErrorMessages(TestCase, WagtailTestUtils): self.assertContains(response, """
""", count=1, html=True) # Error on title shown in the header message self.assertContains(response, "