Skip to content

EspoCRM – Open Source CRM Application

ref

Yuri Kuznetsovfe81fd354941
diff --git a/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php b/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php
index 113e3f3c89..5b94741826 100644
--- a/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php
+++ b/application/Espo/Core/FieldProcessing/VersionNumber/BeforeSaveProcessor.php
@@ -29,11 +29,13 @@
namespace Espo\Core\FieldProcessing\VersionNumber;
+use Espo\Core\Name\Field;
use Espo\Core\Utils\Metadata;
use Espo\ORM\Entity;
class BeforeSaveProcessor
{
+ private const ATTRIBUTE_VERSION_NUMBER = Field::VERSION_NUMBER;
public function __construct(private Metadata $metadata)
{}
@@ -48,18 +50,18 @@ class BeforeSaveProcessor
}
if ($entity->isNew()) {
- $entity->set('versionNumber', 1);
+ $entity->set(self::ATTRIBUTE_VERSION_NUMBER, 1);
return;
}
- $entity->clear('versionNumber');
+ $entity->clear(self::ATTRIBUTE_VERSION_NUMBER);
- if (!$entity->hasFetched('versionNumber')) {
+ if (!$entity->hasFetched(self::ATTRIBUTE_VERSION_NUMBER)) {
return;
}
- $versionNumber = $entity->getFetched('versionNumber');
+ $versionNumber = $entity->getFetched(self::ATTRIBUTE_VERSION_NUMBER);
if ($versionNumber === null) {
$versionNumber = 0;
@@ -67,6 +69,6 @@ class BeforeSaveProcessor
$versionNumber++;
- $entity->set('versionNumber', $versionNumber);
+ $entity->set(self::ATTRIBUTE_VERSION_NUMBER, $versionNumber);
}
}
diff --git a/application/Espo/Core/Name/Field.php b/application/Espo/Core/Name/Field.php
index 62d0d9ee3f..25b199ceaf 100644
--- a/application/Espo/Core/Name/Field.php
+++ b/application/Espo/Core/Name/Field.php
@@ -48,4 +48,5 @@ class Field
public const IS_STARRED = 'isStarred';
public const EMAIL_ADDRESS = 'emailAddress';
public const PHONE_NUMBER = 'phoneNumber';
+ public const VERSION_NUMBER = 'versionNumber';
}
diff --git a/application/Espo/Core/Record/Service.php b/application/Espo/Core/Record/Service.php
index 6d9b71bd8b..516b98422e 100644
--- a/application/Espo/Core/Record/Service.php
+++ b/application/Espo/Core/Record/Service.php
@@ -39,6 +39,7 @@ use Espo\Core\Exceptions\ForbiddenSilent;
use Espo\Core\Exceptions\NotFound;
use Espo\Core\Exceptions\NotFoundSilent;
use Espo\Core\FieldSanitize\SanitizeManager;
+use Espo\Core\Name\Field;
use Espo\Core\ORM\Defs\AttributeParam;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\ORM\Repository\Option\SaveOption;
@@ -117,7 +118,7 @@ class Service implements Crud,
use Di\SelectBuilderFactorySetter;
use Di\AssignmentCheckerManagerSetter;
- private const ATTRIBUTE_VERSION_NUMBER = 'versionNumber';
+ private const ATTRIBUTE_VERSION_NUMBER = Field::VERSION_NUMBER;
protected string $entityType;
protected bool $getEntityBeforeUpdate = false;
diff --git a/application/Espo/Core/Utils/Database/Orm/Converter.php b/application/Espo/Core/Utils/Database/Orm/Converter.php
index d2cbe2d431..e837378590 100644
--- a/application/Espo/Core/Utils/Database/Orm/Converter.php
+++ b/application/Espo/Core/Utils/Database/Orm/Converter.php
@@ -544,7 +544,7 @@ class Converter
// @todo Refactor.
if ($this->metadata->get(['entityDefs', $entityType, 'optimisticConcurrencyControl'])) {
- $ormMetadata[$entityType][EntityParam::ATTRIBUTES]['versionNumber'] = [
+ $ormMetadata[$entityType][EntityParam::ATTRIBUTES][Field::VERSION_NUMBER] = [
AttributeParam::TYPE => Entity::INT,
AttributeParam::DB_TYPE => Types::BIGINT,
CoreAttributeParam::NOT_EXPORTABLE => true,
diff --git a/application/Espo/Tools/EntityManager/NameUtil.php b/application/Espo/Tools/EntityManager/NameUtil.php
index 61f1c53ee8..2cb10c8660 100644
--- a/application/Espo/Tools/EntityManager/NameUtil.php
+++ b/application/Espo/Tools/EntityManager/NameUtil.php
@@ -139,10 +139,10 @@ class NameUtil
Attribute::DELETED,
'deleteId',
'skipDuplicateCheck',
- 'versionNumber',
'null',
'false',
'true',
+ Field::VERSION_NUMBER,
Field::IS_STARRED,
Field::IS_FOLLOWED,
Field::FOLLOWERS,