comparison core/modules/media/src/MediaAccessControlHandler.php @ 4:a9cd425dd02b

Update, including to Drupal core 8.6.10
author Chris Cannam
date Thu, 28 Feb 2019 13:11:55 +0000
parents c75dbcec494b
children 12f9dff5fda9
comparison
equal deleted inserted replaced
3:307d7a7fd348 4:a9cd425dd02b
45 return AccessResult::allowed()->cachePerPermissions(); 45 return AccessResult::allowed()->cachePerPermissions();
46 } 46 }
47 if ($account->hasPermission('update media') && $is_owner) { 47 if ($account->hasPermission('update media') && $is_owner) {
48 return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity); 48 return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity);
49 } 49 }
50 return AccessResult::neutral()->cachePerPermissions(); 50 return AccessResult::neutral("The following permissions are required: 'update any media' OR 'update own media' OR '$type: edit any media' OR '$type: edit own media'.")->cachePerPermissions();
51 51
52 case 'delete': 52 case 'delete':
53 if ($account->hasPermission('delete any ' . $type . ' media')) { 53 if ($account->hasPermission('delete any ' . $type . ' media')) {
54 return AccessResult::allowed()->cachePerPermissions(); 54 return AccessResult::allowed()->cachePerPermissions();
55 } 55 }
62 return AccessResult::allowed()->cachePerPermissions(); 62 return AccessResult::allowed()->cachePerPermissions();
63 } 63 }
64 if ($account->hasPermission('delete media') && $is_owner) { 64 if ($account->hasPermission('delete media') && $is_owner) {
65 return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity); 65 return AccessResult::allowed()->cachePerPermissions()->cachePerUser()->addCacheableDependency($entity);
66 } 66 }
67 return AccessResult::neutral()->cachePerPermissions(); 67 return AccessResult::neutral("The following permissions are required: 'delete any media' OR 'delete own media' OR '$type: delete any media' OR '$type: delete own media'.")->cachePerPermissions();
68 68
69 default: 69 default:
70 return AccessResult::neutral()->cachePerPermissions(); 70 return AccessResult::neutral()->cachePerPermissions();
71 } 71 }
72 } 72 }