From 4c1dbd402b69093c069ffa12d8e01e4e5a816d83 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 3 Jul 2017 21:37:15 +1200 Subject: [PATCH] NEW Change "only these people" to "only these groups" in permissions --- code/Model/SiteTree.php | 2 +- lang/en.yml | 2 +- tests/behat/features/manage-page-permissions.feature | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index 55592efb..918c822e 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -2004,7 +2004,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi InheritedPermissions::LOGGED_IN_USERS => _t(__CLASS__.'.ACCESSLOGGEDIN', "Logged-in users"), InheritedPermissions::ONLY_THESE_USERS => _t( __CLASS__.'.ACCESSONLYTHESE', - "Only these people (choose from list)" + "Only these groups (choose from list)" ), ]; $viewersOptionsField->setSource($viewersOptionsSource); diff --git a/lang/en.yml b/lang/en.yml index e0f4f3c3..1a231cf0 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -164,7 +164,7 @@ en: ACCESSANYONE: Anyone ACCESSHEADER: 'Who can view this page?' ACCESSLOGGEDIN: 'Logged-in users' - ACCESSONLYTHESE: 'Only these people (choose from list)' + ACCESSONLYTHESE: 'Only these groups (choose from list)' ADDEDTODRAFTHELP: 'Page has not been published yet' ADDEDTODRAFTSHORT: Draft APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.' diff --git a/tests/behat/features/manage-page-permissions.feature b/tests/behat/features/manage-page-permissions.feature index c5343f6f..8e89c3d3 100644 --- a/tests/behat/features/manage-page-permissions.feature +++ b/tests/behat/features/manage-page-permissions.feature @@ -29,7 +29,7 @@ Feature: Manage global page permissions Then I should see "Welcome" Scenario: I can limit global view permissions to certain groups - Given I select "Only these people (choose from list)" from "Who can view pages on this site?" input group + Given I select "Only these groups (choose from list)" from "Who can view pages on this site?" input group And I select "AUTHOR group" from "Viewer Groups" with javascript And I press the "Save" button When I am not logged in @@ -50,7 +50,7 @@ Feature: Manage global page permissions And pages should be editable by "ADMIN" Scenario: I can limit global edit permissions to certain groups - Given I select "Only these people (choose from list)" from "Who can edit pages on this site?" input group + Given I select "Only these groups (choose from list)" from "Who can edit pages on this site?" input group And I select "ADMIN group" from "Editor Groups" with javascript And I press the "Save" button Then pages should not be editable by "AUTHOR"