EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
rename
Yuri Kuznetsovd2f24f2bcb86
diff --git a/application/Espo/Core/ORM/Repository/Option/SaveContext.php b/application/Espo/Core/ORM/Repository/Option/SaveContext.phpindex 22b5955647..38b794b67c 100644--- a/application/Espo/Core/ORM/Repository/Option/SaveContext.php+++ b/application/Espo/Core/ORM/Repository/Option/SaveContext.php@@ -45,28 +45,38 @@ class SaveContext{public const NAME = 'context';- private string $id;+ private string $actionId;private bool $linkUpdated = false;/** @var Closure[] */private array $deferredActions = [];/**- * @param ?string $id An action ID.+ * @param ?string $actionId An action ID.*/public function __construct(- ?string $id = null,+ ?string $actionId = null,) {- $this->id = $id ?? Util::generateId();+ $this->actionId = $actionId ?? Util::generateId();}/*** An action ID. Used to group notifications. If a save invokes another save, the same ID can be re-used,* but the context instance should not be re-used. Create a derived context for this.+ *+ * @since 9.2.0+ */+ public function getActionId(): string+ {+ return $this->actionId;+ }++ /**+ * @deprecated Since v9.2.0. Use `getActionId`.*/public function getId(): string{- return $this->id;+ return $this->getActionId();}public function setLinkUpdated(): self@@ -147,6 +157,6 @@ class SaveContext*/public function createDerived(): self{- return new self($this->id);+ return new self($this->actionId);}}diff --git a/application/Espo/Hooks/Note/Notifications.php b/application/Espo/Hooks/Note/Notifications.phpindex 5ad08e2f59..0716b2e617 100644--- a/application/Espo/Hooks/Note/Notifications.php+++ b/application/Espo/Hooks/Note/Notifications.php@@ -55,7 +55,7 @@ class Notifications implements AfterSave$saveContext = SaveContext::obtainFromOptions($options);- $params = new Params(actionId: $saveContext?->getId());+ $params = new Params(actionId: $saveContext?->getActionId());$this->processor->afterSave($entity, $params);}diff --git a/application/Espo/Tools/Notification/HookProcessor.php b/application/Espo/Tools/Notification/HookProcessor.phpindex 7c90a56b10..14883bece3 100644--- a/application/Espo/Tools/Notification/HookProcessor.php+++ b/application/Espo/Tools/Notification/HookProcessor.php@@ -102,7 +102,7 @@ class HookProcessor$saveContext = SaveContext::obtainFromRawOptions($options);if ($saveContext) {- $params = $params->withActionId($saveContext->getId());+ $params = $params->withActionId($saveContext->getActionId());}$notificator->process($entity, $params);