espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

field const usage

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-11-11 16:14:06 +02:00
parent 9e396b43a8
commit 29bee428ed
27 changed files with 77 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Classes/DefaultLayouts/DefaultSidePanelType.php
+2 -2
View File
@@ -49,8 +49,8 @@ class DefaultSidePanelType
$list = [];
if (
$this->metadata->get(['entityDefs', $scope, 'fields', 'assignedUser', 'type']) === FieldType::LINK &&
$this->metadata->get(['entityDefs', $scope, 'links', 'assignedUser', 'entity']) === User::ENTITY_TYPE
$this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USER, 'type']) === FieldType::LINK &&
$this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USER, 'entity']) === User::ENTITY_TYPE
||
$this->metadata->get(['entityDefs', $scope, 'fields', Field::ASSIGNED_USERS, 'type']) === FieldType::LINK_MULTIPLE &&
$this->metadata->get(['entityDefs', $scope, 'links', Field::ASSIGNED_USERS, 'entity']) === User::ENTITY_TYPE
application/Espo/Classes/JobPreparators/CheckEmailAccounts.php
+2 -1
View File
@@ -31,6 +31,7 @@ namespace Espo\Classes\JobPreparators;
use Espo\Core\Job\Preparator;
use Espo\Core\Job\Preparator\Data;
use Espo\Core\Name\Field;
use Espo\ORM\EntityManager;
use Espo\Entities\EmailAccount;
use Espo\Core\Job\Preparator\CollectionHelper;
@@ -51,7 +52,7 @@ class CheckEmailAccounts implements Preparator
{
$collection = $this->entityManager
->getRDBRepositoryByClass(EmailAccount::class)
->join('assignedUser', 'assignedUserAdditional')
->join(Field::ASSIGNED_USER, 'assignedUserAdditional')
->where([
'status' => EmailAccount::STATUS_ACTIVE,
'useImap' => true,
application/Espo/Entities/Attachment.php
+1 -1
View File
@@ -99,7 +99,7 @@ class Attachment extends Entity
public function getParent(): ?LinkParent
{
/** @var ?LinkParent */
return $this->getValueObject('parent');
return $this->getValueObject(Field::PARENT);
}
public function getRelated(): ?LinkParent
application/Espo/Entities/Email.php
+5 -5
View File
@@ -648,7 +648,7 @@ class Email extends Entity
public function getParent(): ?LinkParent
{
/** @var ?LinkParent */
return $this->getValueObject('parent');
return $this->getValueObject(Field::PARENT);
}
public function setAccount(?Link $account): self
@@ -661,12 +661,12 @@ class Email extends Entity
public function setParent(LinkParent|Entity|null $parent): self
{
if ($parent instanceof LinkParent) {
$this->setValueObject('parent', $parent);
$this->setValueObject(Field::PARENT, $parent);
return $this;
}
$this->relations->set('parent', $parent);
$this->relations->set(Field::PARENT, $parent);
return $this;
}
@@ -703,13 +703,13 @@ class Email extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getCreatedBy(): ?Link
{
/** @var ?Link */
return $this->getValueObject('createdBy');
return $this->getValueObject(Field::CREATED_BY);
}
public function getSentBy(): ?Link
application/Espo/Entities/EmailAccount.php
+2 -1
View File
@@ -29,6 +29,7 @@
namespace Espo\Entities;
use Espo\Core\Name\Field;
use Espo\Core\ORM\Entity;
use Espo\Core\Field\Date;
@@ -66,7 +67,7 @@ class EmailAccount extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
application/Espo/Entities/Export.php
+1 -1
View File
@@ -99,7 +99,7 @@ class Export extends Entity
public function getCreatedBy(): Link
{
$value = $this->getValueObject('createdBy');
$value = $this->getValueObject(Field::CREATED_BY);
if (!$value instanceof Link) {
throw new RuntimeException("No 'createdBy'.");
application/Espo/Entities/Note.php
+5 -5
View File
@@ -228,12 +228,12 @@ class Note extends Entity
public function setParent(LinkParent|Entity $parent): self
{
if ($parent instanceof LinkParent) {
$this->setValueObject('parent', $parent);
$this->setValueObject(Field::PARENT, $parent);
return $this;
}
$this->relations->set('parent', $parent);
$this->relations->set(Field::PARENT, $parent);
return $this;
}
@@ -291,7 +291,7 @@ class Note extends Entity
}
if ($this->getParentId() && $this->getParentType()) {
$this->loadParentNameField('parent');
$this->loadParentNameField(Field::PARENT);
}
if ($this->getRelatedId() && $this->getRelatedType()) {
@@ -318,7 +318,7 @@ class Note extends Entity
$targetType !== self::TARGET_SELF
) {
if (!$targetType || $targetType === self::TARGET_TEAMS) {
$this->loadLinkMultipleField('teams');
$this->loadLinkMultipleField(Field::TEAMS);
} else if ($targetType === self::TARGET_PORTALS) {
$this->loadLinkMultipleField('portals');
}
@@ -356,7 +356,7 @@ class Note extends Entity
public function getParent(): ?OrmEntity
{
return $this->relations->getOne('parent');
return $this->relations->getOne(Field::PARENT);
}
/**
application/Espo/Entities/UserReaction.php
+3 -2
View File
@@ -30,6 +30,7 @@
namespace Espo\Entities;
use Espo\Core\Field\LinkParent;
use Espo\Core\Name\Field;
use Espo\Core\ORM\Entity;
class UserReaction extends Entity
@@ -44,7 +45,7 @@ class UserReaction extends Entity
public function getParent(): LinkParent
{
/** @var LinkParent */
return $this->getValueObject('parent');
return $this->getValueObject(Field::PARENT);
}
public function setType(string $type): self
@@ -56,7 +57,7 @@ class UserReaction extends Entity
public function setParent(Note $note): self
{
$this->relations->set('parent', $note);
$this->relations->set(Field::PARENT, $note);
return $this;
}
application/Espo/Modules/Crm/Business/Event/Invitations.php
+2 -1
View File
@@ -32,6 +32,7 @@ namespace Espo\Modules\Crm\Business\Event;
use Espo\Core\Field\DateTime as DateTimeField;
use Espo\Core\Field\LinkParent;
use Espo\Core\Mail\Exceptions\SendingError;
use Espo\Core\Name\Field;
use Espo\Entities\Attachment;
use Espo\Entities\Email;
use Espo\Entities\UniqueId;
@@ -198,7 +199,7 @@ class Invitations
{
/** @var ?User $user */
$user = $this->entityManager
->getRelation($entity, 'assignedUser')
->getRelation($entity, Field::ASSIGNED_USER)
->findOne();
$addressList = [];
application/Espo/Modules/Crm/Entities/Account.php
+5 -4
View File
@@ -34,6 +34,7 @@ use Espo\Core\Field\EmailAddressGroup;
use Espo\Core\Field\Link;
use Espo\Core\Field\LinkMultiple;
use Espo\Core\Field\PhoneNumberGroup;
use Espo\Core\Name\Field;
use Espo\Core\ORM\Entity;
use Espo\Entities\User;
@@ -117,23 +118,23 @@ class Account extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
{
/** @var LinkMultiple */
return $this->getValueObject('teams');
return $this->getValueObject(Field::TEAMS);
}
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
{
$this->setValueObject('teams', $teams);
$this->setValueObject(Field::TEAMS, $teams);
return $this;
}
application/Espo/Modules/Crm/Entities/Call.php
+4 -4
View File
@@ -133,24 +133,24 @@ class Call extends Entity
public function setParent(Entity|LinkParent|null $parent): self
{
if ($parent instanceof LinkParent) {
$this->setValueObject('parent', $parent);
$this->setValueObject(Field::PARENT, $parent);
return $this;
}
$this->relations->set('parent', $parent);
$this->relations->set(Field::PARENT, $parent);
return $this;
}
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
{
$this->setValueObject('teams', $teams);
$this->setValueObject(Field::TEAMS, $teams);
return $this;
}
application/Espo/Modules/Crm/Entities/Campaign.php
+2 -2
View File
@@ -70,7 +70,7 @@ class Campaign extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
@@ -81,7 +81,7 @@ class Campaign extends Entity
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
application/Espo/Modules/Crm/Entities/CampaignLogRecord.php
+2 -1
View File
@@ -30,6 +30,7 @@
namespace Espo\Modules\Crm\Entities;
use Espo\Core\Field\LinkParent;
use Espo\Core\Name\Field;
use Espo\Core\ORM\Entity;
class CampaignLogRecord extends Entity
@@ -50,6 +51,6 @@ class CampaignLogRecord extends Entity
public function getParent(): ?LinkParent
{
/** @var ?LinkParent */
return $this->getValueObject('parent');
return $this->getValueObject(Field::PARENT);
}
}
application/Espo/Modules/Crm/Entities/CaseObj.php
+3 -3
View File
@@ -94,13 +94,13 @@ class CaseObj extends \Espo\Core\ORM\Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
{
/** @var LinkMultiple */
return $this->getValueObject('teams');
return $this->getValueObject(Field::TEAMS);
}
/**
@@ -123,7 +123,7 @@ class CaseObj extends \Espo\Core\ORM\Entity
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
application/Espo/Modules/Crm/Entities/Contact.php
+5 -4
View File
@@ -32,6 +32,7 @@ namespace Espo\Modules\Crm\Entities;
use Espo\Core\Entities\Person;
use Espo\Core\Field\Link;
use Espo\Core\Field\LinkMultiple;
use Espo\Core\Name\Field;
use Espo\Entities\User;
class Contact extends Person
@@ -44,7 +45,7 @@ class Contact extends Person
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
/**
@@ -71,7 +72,7 @@ class Contact extends Person
public function getTeams(): LinkMultiple
{
/** @var LinkMultiple */
return $this->getValueObject('teams');
return $this->getValueObject(Field::TEAMS);
}
/**
@@ -84,12 +85,12 @@ class Contact extends Person
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
{
$this->setValueObject('teams', $teams);
$this->setValueObject(Field::TEAMS, $teams);
return $this;
}
application/Espo/Modules/Crm/Entities/Document.php
+2 -2
View File
@@ -75,7 +75,7 @@ class Document extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
@@ -86,7 +86,7 @@ class Document extends Entity
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
application/Espo/Modules/Crm/Entities/KnowledgeBaseArticle.php
+3 -3
View File
@@ -57,7 +57,7 @@ class KnowledgeBaseArticle extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
@@ -86,12 +86,12 @@ class KnowledgeBaseArticle extends Entity
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
{
$this->setValueObject('teams', $teams);
$this->setValueObject(Field::TEAMS, $teams);
return $this;
}
application/Espo/Modules/Crm/Entities/Lead.php
+2 -2
View File
@@ -106,7 +106,7 @@ class Lead extends \Espo\Core\Entities\Person
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
@@ -155,7 +155,7 @@ class Lead extends \Espo\Core\Entities\Person
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
application/Espo/Modules/Crm/Entities/Meeting.php
+4 -4
View File
@@ -108,7 +108,7 @@ class Meeting extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
@@ -138,19 +138,19 @@ class Meeting extends Entity
public function setParent(Entity|LinkParent|null $parent): self
{
if ($parent instanceof LinkParent) {
$this->setValueObject('parent', $parent);
$this->setValueObject(Field::PARENT, $parent);
return $this;
}
$this->relations->set('parent', $parent);
$this->relations->set(Field::PARENT, $parent);
return $this;
}
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
application/Espo/Modules/Crm/Entities/Opportunity.php
+2 -2
View File
@@ -131,7 +131,7 @@ class Opportunity extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
@@ -147,7 +147,7 @@ class Opportunity extends Entity
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
application/Espo/Modules/Crm/Entities/TargetList.php
+5 -4
View File
@@ -31,6 +31,7 @@ namespace Espo\Modules\Crm\Entities;
use Espo\Core\Field\Link;
use Espo\Core\Field\LinkMultiple;
use Espo\Core\Name\Field;
use Espo\Core\ORM\Entity;
use Espo\Entities\User;
@@ -41,23 +42,23 @@ class TargetList extends Entity
public function getAssignedUser(): ?Link
{
/** @var ?Link */
return $this->getValueObject('assignedUser');
return $this->getValueObject(Field::ASSIGNED_USER);
}
public function getTeams(): LinkMultiple
{
/** @var LinkMultiple */
return $this->getValueObject('teams');
return $this->getValueObject(Field::TEAMS);
}
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
{
$this->setValueObject('teams', $teams);
$this->setValueObject(Field::TEAMS, $teams);
return $this;
}
application/Espo/Modules/Crm/Entities/Task.php
+2 -2
View File
@@ -121,12 +121,12 @@ class Task extends Entity
public function setAssignedUser(Link|User|null $assignedUser): self
{
return $this->setRelatedLinkOrEntity('assignedUser', $assignedUser);
return $this->setRelatedLinkOrEntity(Field::ASSIGNED_USER, $assignedUser);
}
public function setTeams(LinkMultiple $teams): self
{
$this->setValueObject('teams', $teams);
$this->setValueObject(Field::TEAMS, $teams);
return $this;
}
application/Espo/Modules/Crm/Tools/Activities/UpcomingService.php
+3 -2
View File
@@ -33,6 +33,7 @@ use Espo\Core\Acl;
use Espo\Core\Exceptions\BadRequest;
use Espo\Core\Exceptions\NotFound;
use Espo\Core\Exceptions\Forbidden;
use Espo\Core\Name\Field;
use Espo\Core\ORM\Entity as CoreEntity;
use Espo\Core\Record\ServiceContainer;
use Espo\Core\Select\Bool\Filters\OnlyMy;
@@ -180,9 +181,9 @@ class UpcomingService
if (
$entity instanceof CoreEntity &&
$entity->hasLinkParentField('parent')
$entity->hasLinkParentField(Field::PARENT)
) {
$entity->loadParentNameField('parent');
$entity->loadParentNameField(Field::PARENT);
}
$this->serviceContainer->get($itemEntityType)->prepareEntityForOutput($entity);
application/Espo/Modules/Crm/Tools/MassEmail/SendingProcessor.php
+2 -1
View File
@@ -29,6 +29,7 @@
namespace Espo\Modules\Crm\Tools\MassEmail;
use Espo\Core\Name\Field;
use Espo\Tools\EmailTemplate\Result;
use Laminas\Mail\Message;
@@ -556,7 +557,7 @@ class SendingProcessor
}
if ($campaign) {
$email->setLinkMultipleIdList('teams', $campaign->getLinkMultipleIdList('teams'));
$email->setLinkMultipleIdList(Field::TEAMS, $campaign->getLinkMultipleIdList(Field::TEAMS));
}
$senderParams = $senderParams->withFromAddress(
application/Espo/Tools/EntityManager/Hook/Hooks/PlusCreateHook.php
+4 -3
View File
@@ -29,6 +29,7 @@
namespace Espo\Tools\EntityManager\Hook\Hooks;
use Espo\Core\Name\Field;
use Espo\Core\Templates\Entities\BasePlus;
use Espo\Core\Templates\Entities\Company;
use Espo\Core\Templates\Entities\Person;
@@ -67,18 +68,18 @@ class PlusCreateHook implements CreateHook
$entityTypeList = array_unique($entityTypeList);
foreach ($entityTypeList as $entityType) {
if (!$this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'])) {
if (!$this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'])) {
continue;
}
$list = $this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'], []);
$list = $this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'], []);
if (!in_array($name, $list)) {
$list[] = $name;
$data = [
'fields' => [
'parent' => ['entityList' => $list]
Field::PARENT => ['entityList' => $list]
]
];
application/Espo/Tools/EntityManager/Hook/Hooks/PlusDeleteHook.php
+3 -2
View File
@@ -29,6 +29,7 @@
namespace Espo\Tools\EntityManager\Hook\Hooks;
use Espo\Core\Name\Field;
use Espo\Core\Templates\Entities\BasePlus;
use Espo\Core\Templates\Entities\Company;
use Espo\Core\Templates\Entities\Person;
@@ -67,11 +68,11 @@ class PlusDeleteHook implements CreateHook
$entityTypeList = array_unique($entityTypeList);
foreach ($entityTypeList as $entityType) {
if (!$this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'])) {
if (!$this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'])) {
continue;
}
$list = $this->metadata->get(['entityDefs', $entityType, 'fields', 'parent', 'entityList'], []);
$list = $this->metadata->get(['entityDefs', $entityType, 'fields', Field::PARENT, 'entityList'], []);
if (in_array($name, $list)) {
$key = array_search($name, $list);
application/Espo/Tools/Stream/UserRecordService.php
+1 -1
View File
@@ -144,7 +144,7 @@ class UserRecordService
$baseBuilder = $this->queryHelper->buildBaseQueryBuilder($searchParams)
->select($this->queryHelper->getUserQuerySelect())
->leftJoin('createdBy')
->leftJoin(Field::CREATED_BY)
->order('number', Order::DESC)
->limit(0, $offset + $maxSize + 1);