From 6a685718c7eafa76eca018d4eee239b43fdd588d Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Mon, 22 Jul 2024 08:58:29 +1000
Subject: [PATCH] Issue #2329253 by tstoeckler, Bhanu951, hchonov,
golddragon007, DieterHolvoet, casey, Sam152, mikelutz, junaidpv, codebymikey,
mkalkbrenner, dawehner, smustgrave, kksandr, muthuraman-s, weekbeforenext,
Gunjan Rao Naik, Wim Leers, DamienMcKenna, longwave, Berdir, quietone,
claudiu.cristea, heddn: Allow ChangedItem to skip updating the entity's
"changed" timestamp when synchronizing
---
.../Plugin/Field/FieldType/ChangedItem.php | 17 ++++++++------
.../Core/Entity/ContentEntityChangedTest.php | 23 +++++++++++++++++++
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
index 7116809acdb4..3294ed40c97e 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/ChangedItem.php
@@ -5,6 +5,7 @@
use Drupal\Core\Field\Attribute\FieldType;
use Drupal\Core\Field\ChangedFieldItemList;
use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\Entity\SynchronizableInterface;
/**
* Defines the 'changed' entity field type.
@@ -44,13 +45,15 @@ public function preSave() {
// \Drupal\content_translation\ContentTranslationMetadataWrapperInterface::setChangedTime().
/** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
$entity = $this->getEntity();
- /** @var \Drupal\Core\Entity\ContentEntityInterface $original */
- $original = $entity->original;
- $langcode = $entity->language()->getId();
- if (!$entity->isNew() && $original && $original->hasTranslation($langcode)) {
- $original_value = $original->getTranslation($langcode)->get($this->getFieldDefinition()->getName())->value;
- if ($this->value == $original_value && $entity->hasTranslationChanges()) {
- $this->value = \Drupal::time()->getRequestTime();
+ if (!$entity instanceof SynchronizableInterface || !$entity->isSyncing()) {
+ /** @var \Drupal\Core\Entity\ContentEntityInterface $original */
+ $original = $entity->original;
+ $langcode = $entity->language()->getId();
+ if (!$entity->isNew() && $original && $original->hasTranslation($langcode)) {
+ $original_value = $original->getTranslation($langcode)->get($this->getFieldDefinition()->getName())->value;
+ if ($this->value == $original_value && $entity->hasTranslationChanges()) {
+ $this->value = \Drupal::time()->getRequestTime();
+ }
}
}
}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
index 32a49bf0a048..7824248bf55b 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityChangedTest.php
@@ -472,6 +472,29 @@ public function testRevisionChanged(): void {
}
+ /**
+ * Tests the changed functionality when an entity is syncing.
+ */
+ public function testChangedSyncing(): void {
+ $entity = EntityTestMulChanged::create();
+ $entity->save();
+ $changed_time_1 = $entity->getChangedTime();
+
+ // Without the syncing flag the changed time will increment when content is
+ // changed.
+ $entity->setName($this->randomString());
+ $entity->save();
+ $changed_time_2 = $entity->getChangedTime();
+ $this->assertTrue($changed_time_2 > $changed_time_1);
+
+ // With the syncing flag, the changed time will not change.
+ $entity->setName($this->randomString());
+ $entity->setSyncing(TRUE);
+ $entity->save();
+ $changed_time_3 = $entity->getChangedTime();
+ $this->assertEquals($changed_time_2, $changed_time_3);
+ }
+
/**
* Retrieves the revision translation affected flag value.
*
--
GitLab