Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drupal Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Composer
plugin
Drupal Environment
Commits
0ad092be
Commit
0ad092be
authored
4 months ago
by
jurgenhaas
Browse files
Options
Downloads
Patches
Plain Diff
Add patch to group module
parent
8d444cb3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!367
Merging develop into main
Pipeline
#1364663
passed
4 months ago
Stage: build
Stage: validate
Stage: release
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
patches/d10-3.json
+3
-0
3 additions, 0 deletions
patches/d10-3.json
patches/d10-4.json
+3
-0
3 additions, 0 deletions
patches/d10-4.json
patches/d10/3416324.diff
+26
-0
26 additions, 0 deletions
patches/d10/3416324.diff
patches/d11.json
+3
-0
3 additions, 0 deletions
patches/d11.json
with
35 additions
and
0 deletions
patches/d10-3.json
+
3
−
0
View file @
0ad092be
...
...
@@ -124,6 +124,9 @@
"drupal/glossify"
:
{
"#3360633 HTML entities"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3360633.diff"
},
"drupal/group"
:
{
"#3416324 Related entity tokens"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3416324.diff"
},
"drupal/http_client_manager"
:
{
"#3385117 Code generator"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3385117.diff"
},
...
...
This diff is collapsed.
Click to expand it.
patches/d10-4.json
+
3
−
0
View file @
0ad092be
...
...
@@ -124,6 +124,9 @@
"drupal/glossify"
:
{
"#3360633 HTML entities"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3360633.diff"
},
"drupal/group"
:
{
"#3416324 Related entity tokens"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3416324.diff"
},
"drupal/http_client_manager"
:
{
"#3385117 Code generator"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3385117.diff"
},
...
...
This diff is collapsed.
Click to expand it.
patches/d10/3416324.diff
0 → 100644
+
26
−
0
View file @
0ad092be
diff --git a/group.tokens.inc b/group.tokens.inc
index 686b2756bd7d49bbd89b4ea7a3633473c933bc7b..1f904fdcb11ee3c11fa628c4304eeb2a44ecdca4 100644
--- a/group.tokens.inc
+++ b/group.tokens.inc
@@ -272,5 +272,21 @@
function group_tokens($type, $tokens, array $data, array $options, BubbleableMet
if ($changed_tokens = $token_service->findWithPrefix($tokens, 'changed')) {
$replacements += $token_service->generate('date', $changed_tokens, ['date' => $group_relationship->getChangedTime()], $options, $bubbleable_metadata);
}
+
+ // Provide access to tokens of the related entity.
+ if (str_starts_with($name, 'entity:')) {
+ $entity = $group_relationship->getEntity();
+ $entityTypeId = $entity->getEntityTypeId();
+ $bubbleable_metadata->addCacheableDependency($entity);
+ $parts = explode(':', $name);
+ $parts[0] = $entityTypeId;
+ $realTokens = [
+ implode(':', $parts) => $original,
+ ];
+ if ($entity_tokens = $token_service->findWithPrefix($realTokens, $entityTypeId)) {
+ $replacements += $token_service->generate($entityTypeId, $entity_tokens, [$entityTypeId => $entity], $options, $bubbleable_metadata);
+ }
+ }
+
}
}
This diff is collapsed.
Click to expand it.
patches/d11.json
+
3
−
0
View file @
0ad092be
...
...
@@ -118,6 +118,9 @@
"drupal/gin_toolbar"
:
{
"#3319445 Permission check"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3319445.diff"
},
"drupal/group"
:
{
"#3416324 Related entity tokens"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3416324.diff"
},
"drupal/glossify"
:
{
"#3360633 HTML entities"
:
"https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3360633.diff"
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment