projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further Drupal 8.6.4 changes. Some core files were not committed before a commit...
[yaffs-website]
/
web
/
core
/
modules
/
workspaces
/
workspaces.module
diff --git
a/web/core/modules/workspaces/workspaces.module
b/web/core/modules/workspaces/workspaces.module
index f279c4389375284519a6d2f52ce0d5d15bda3331..8f4f2fa2e281a6ae0ca6353a2463c3cb2471e2dc 100644
(file)
--- a/
web/core/modules/workspaces/workspaces.module
+++ b/
web/core/modules/workspaces/workspaces.module
@@
-56,6
+56,15
@@
function workspaces_form_alter(&$form, FormStateInterface $form_state, $form_id)
->formAlter($form, $form_state, $form_id);
}
->formAlter($form, $form_state, $form_id);
}
+/**
+ * Implements hook_field_info_alter().
+ */
+function workspaces_field_info_alter(&$definitions) {
+ \Drupal::service('class_resolver')
+ ->getInstanceFromDefinition(EntityTypeInfo::class)
+ ->fieldInfoAlter($definitions);
+}
+
/**
* Implements hook_entity_load().
*/
/**
* Implements hook_entity_load().
*/
@@
-154,15
+163,15
@@
function workspaces_toolbar() {
$current_user = \Drupal::currentUser();
if (!$current_user->hasPermission('administer workspaces')
$current_user = \Drupal::currentUser();
if (!$current_user->hasPermission('administer workspaces')
-
||
!$current_user->hasPermission('view own workspace')
-
||
!$current_user->hasPermission('view any workspace')) {
+
&&
!$current_user->hasPermission('view own workspace')
+
&&
!$current_user->hasPermission('view any workspace')) {
return $items;
}
/** @var \Drupal\workspaces\WorkspaceInterface $active_workspace */
$active_workspace = \Drupal::service('workspaces.manager')->getActiveWorkspace();
return $items;
}
/** @var \Drupal\workspaces\WorkspaceInterface $active_workspace */
$active_workspace = \Drupal::service('workspaces.manager')->getActiveWorkspace();
- $items['workspace'] = [
+ $items['workspace']
+
= [
'#type' => 'toolbar_item',
'tab' => [
'#type' => 'link',
'#type' => 'toolbar_item',
'tab' => [
'#type' => 'link',
@@
-180,6
+189,7
@@
function workspaces_toolbar() {
],
]),
],
],
]),
],
+ '#cache' => ['tags' => $active_workspace->getCacheTags()],
],
'#wrapper_attributes' => [
'class' => ['workspaces-toolbar-tab'],
],
'#wrapper_attributes' => [
'class' => ['workspaces-toolbar-tab'],