Replace user_access() calls with $account->hasPermission() in book module [#2061973]

Let's start to convert all calls to user_access() with the new AccountInterface::hasPermission() method.

Part of #2048171: [meta] Replace user_access() calls with $account->hasPermission() wherever possible.

Change records for this issue:

user_access() got converted to a method on the user/accountInterface

Comment	File	Size	Author
#6	drupal-book_replace_user_access-2061973-6.patch	4.15 KB	naveenvalecha
#3	drupal-book_replace_user_access-2061973.patch	5.84 KB	internetdevels
#3	interdiff.txt	3.33 KB	internetdevels
#1	drupal-book_replace_user_access-2061973.patch	5.7 KB	internetdevels

Comments

Comment #1

internetdevels commented 10 August 2013 at 09:29

Status:

Active

» Needs review

Status	File	Size
new	drupal-book_replace_user_access-2061973.patch	5.7 KB

Patch attached.

Comment #2

10 August 2013 at 10:54

Status:

Needs review

» Needs work

The last submitted patch, drupal-book_replace_user_access-2061973.patch, failed testing.

Comment #3

internetdevels commented 10 August 2013 at 18:05

Status	File	Size
new	interdiff.txt	3.33 KB
new	drupal-book_replace_user_access-2061973.patch	5.84 KB

Again problem with anonymous and Drupal::request(). I've added a workaround, locally test passed.

Comment #4

internetdevels commented 10 August 2013 at 18:13

Status:

Needs work

» Needs review

Comment #5

andypost

he/him

Russian

commented 29 August 2013 at 16:38

Status:

Needs review

» Needs work

+++ b/core/modules/book/book.admin.inc
@@ -209,7 +209,7 @@ function theme_book_admin_table($variables) {
+  $access = Drupal::request()->attributes->get('_account')->hasPermission('administer nodes');

+++ b/core/modules/book/book.module
@@ -126,7 +126,8 @@ function book_node_view_link(EntityInterface $node, $view_mode) {
+      $user = Drupal::request()->attributes->get('_account');

@@ -224,7 +225,9 @@ function book_menu() {
+  $user = Drupal::request()->attributes->get('_account');

@@ -240,7 +243,7 @@ function book_export_access(EntityInterface $node) {
+  return Drupal::request()->attributes->get('_account')->hasPermission('administer book outlines') && node_access('view', $node);

@@ -305,9 +308,11 @@ function book_get_books() {
+  $user = Drupal::request()->attributes->get('_account');

@@ -459,7 +464,7 @@ function _book_add_form_elements(&$form, &$form_state, EntityInterface $node) {
+  if (Drupal::request()->attributes->get('_account')->hasPermission('create new books') && ($nid == 'new' || ($nid != $node->book['original_bid']))) {

@@ -812,7 +817,7 @@ function book_page_alter(&$page) {
+  if (!empty($node->book['bid']) && !Drupal::request()->attributes->get('_account')->hasPermission('administer nodes')) {

@@ -879,8 +884,10 @@ function book_node_predelete(EntityInterface $node) {
+  $user = Drupal::request()->attributes->get('_account');

+++ b/core/modules/book/book.pages.inc
@@ -68,7 +68,7 @@ function book_export($type, EntityInterface $node) {
+  if (Drupal::request()->attributes->get('_account')->hasPermission('access printer-friendly version')) {

All should be Drupal::currentUser() service