From bad2d57bbd21a140066a397121e0efa5677ade5a Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Tue, 28 Feb 2017 21:12:05 -0600
Subject: [PATCH] Issue #2678178 by ftyre76, rajeshwari10, tameeshb, ritzz,
dimaro, felribeiro, Sahil Khambra: Node revision revert/delete permission
descriptions are wrong
---
core/modules/node/node.permissions.yml | 5 +++--
core/modules/node/src/NodePermissions.php | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/core/modules/node/node.permissions.yml b/core/modules/node/node.permissions.yml
index 753ed40147e1..289227c71a70 100644
--- a/core/modules/node/node.permissions.yml
+++ b/core/modules/node/node.permissions.yml
@@ -18,12 +18,13 @@ view own unpublished content:
title: 'View own unpublished content'
view all revisions:
title: 'View all revisions'
+ description: 'To view a revision, you also need permission to view the content item.'
revert all revisions:
title: 'Revert all revisions'
- description: 'Role requires permission <em>view revisions</em> and <em>edit rights</em> for nodes in question or <em>administer nodes</em>.'
+ description: 'To revert a revision, you also need permission to edit the content item.'
delete all revisions:
title: 'Delete all revisions'
- description: 'Role requires permission to <em>view revisions</em> and <em>delete rights</em> for nodes in question or <em>administer nodes</em>.'
+ description: 'To delete a revision, you also need permission to delete the content item.'
permission_callbacks:
- \Drupal\node\NodePermissions::nodeTypePermissions
diff --git a/core/modules/node/src/NodePermissions.php b/core/modules/node/src/NodePermissions.php
index 94b2d935f3de..0bc0cde41174 100644
--- a/core/modules/node/src/NodePermissions.php
+++ b/core/modules/node/src/NodePermissions.php
@@ -62,14 +62,15 @@ protected function buildPermissions(NodeType $type) {
),
"view $type_id revisions" => array(
'title' => $this->t('%type_name: View revisions', $type_params),
+ 'description' => t('To view a revision, you also need permission to view the content item.'),
),
"revert $type_id revisions" => array(
'title' => $this->t('%type_name: Revert revisions', $type_params),
- 'description' => t('Role requires permission <em>view revisions</em> and <em>edit rights</em> for nodes in question, or <em>administer nodes</em>.'),
+ 'description' => t('To revert a revision, you also need permission to edit the content item.'),
),
"delete $type_id revisions" => array(
'title' => $this->t('%type_name: Delete revisions', $type_params),
- 'description' => $this->t('Role requires permission to <em>view revisions</em> and <em>delete rights</em> for nodes in question, or <em>administer nodes</em>.'),
+ 'description' => $this->t('To delete a revision, you also need permission to delete the content item.'),
),
);
}
--
GitLab