diff --git a/core/modules/filter/src/FilterFormatAccessControlHandler.php b/core/modules/filter/src/FilterFormatAccessControlHandler.php index c57e283..5e4a55a 100644 --- a/core/modules/filter/src/FilterFormatAccessControlHandler.php +++ b/core/modules/filter/src/FilterFormatAccessControlHandler.php @@ -20,8 +20,12 @@ class FilterFormatAccessControlHandler extends EntityAccessControlHandler { protected function checkAccess(EntityInterface $filter_format, $operation, AccountInterface $account) { /** @var \Drupal\filter\FilterFormatInterface $filter_format */ + if ($operation === 'view') { + return AccessResult::allowedIfHasPermission($account, 'administer filters'); + } + // All users are allowed to use the fallback filter. - if ($operation == 'use' || $operation == 'view') { + if ($operation == 'use') { if ($filter_format->isFallbackFormat()) { return AccessResult::allowed(); } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php index b52f77e..4d65e00 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/FilterFormat/FilterFormatResourceTestBase.php @@ -26,9 +26,7 @@ * {@inheritdoc} */ protected function setUpAuthorization($method) { - if ($method === 'GET') { - $this->grantPermissionsToTestedRole(['use text format ' . $this->entity->id()]); - } + $this->grantPermissionsToTestedRole(['administer filters']); } /** @@ -87,21 +85,4 @@ protected function getNormalizedPostEntity() { // @todo Update in https://www.drupal.org/node/2300677. } - /** - * {@inheritdoc} - */ - protected function getExpectedUnauthorizedAccessMessage($method) { - if ($this->config('rest.settings')->get('bc_entity_resource_permissions')) { - return parent::getExpectedUnauthorizedAccessMessage($method); - } - - switch ($method) { - case 'GET': - return "The 'use text format pablo' permission is required."; - - default: - return parent::getExpectedUnauthorizedAccessMessage($method); - } - } - }