Core and composer updates

This commit is contained in:
Rob Davies 2017-07-03 16:47:07 +01:00
parent a82634bb98
commit 62cac30480
1118 changed files with 21770 additions and 6306 deletions

View file

@ -8,7 +8,7 @@ source:
uri_scheme: 'internal:/'
process:
shortcut_set:
plugin: migration
plugin: migration_lookup
migration: d7_shortcut_set
source: menu_name
title: link_title

View file

@ -7,14 +7,14 @@ source:
process:
uid:
-
plugin: migration
plugin: migration_lookup
migration: d7_user
source: uid
-
plugin: skip_on_empty
method: row
set_name:
plugin: migration
plugin: migration_lookup
migration: d7_shortcut_set
source: set_name
destination:

View file

@ -19,6 +19,8 @@ class ShortcutSetAccessControlHandler extends EntityAccessControlHandler {
*/
protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
switch ($operation) {
case 'view':
return AccessResult::allowedIf($account->hasPermission('access shortcuts'))->cachePerPermissions();
case 'update':
if ($account->hasPermission('administer shortcuts')) {
return AccessResult::allowed()->cachePerPermissions();