viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-07-17 17:00:47 +03:00
parent 41453b0fb3
commit d46f9ebd1f
6 changed files with 77 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/Espo/Entities/LayoutRecord.php
View File

@@ -29,7 +29,14 @@
namespace Espo\Entities;
class LayoutRecord extends \Espo\Core\ORM\Entity
use Espo\Core\ORM\Entity;
class LayoutRecord extends Entity
{
public const ENTITY_TYPE = 'LayoutRecord';
public function getData(): mixed
{
return $this->get('data');
}
}

12
application/Espo/Entities/LayoutSet.php
View File

@@ -29,7 +29,17 @@
namespace Espo\Entities;
class LayoutSet extends \Espo\Core\ORM\Entity
use Espo\Core\ORM\Entity;
class LayoutSet extends Entity
{
public const ENTITY_TYPE = 'LayoutSet';
/**
* @return string[]
*/
public function getLayoutList(): array
{
return $this->get('layoutList') ?? [];
}
}

6
application/Espo/Entities/Portal.php
View File

@@ -80,4 +80,10 @@ class Portal extends \Espo\Core\ORM\Entity
/** @var ?Link */
return $this->getValueObject('authenticationProvider');
}
public function getLayoutSet(): ?Link
{
/** @var ?Link */
return $this->getValueObject('layoutSet');
}
}

6
application/Espo/Entities/Team.php
View File

@@ -43,4 +43,10 @@ class Team extends \Espo\Core\ORM\Entity
/** @var ?Link */
return $this->getValueObject('workingTimeCalendar');
}
public function getLayoutSet(): ?Link
{
/** @var ?Link */
return $this->getValueObject('layoutSet');
}
}

4
application/Espo/Tools/Layout/CustomLayoutService.php
View File

@@ -41,6 +41,8 @@ use RuntimeException;
class CustomLayoutService
{
private const TYPE_LIST = 'list';
public function __construct(
private Metadata $metadata,
private FileManager $fileManager,
@@ -63,7 +65,7 @@ class CustomLayoutService
$this->checkName($name);
if ($type !== 'list') {
if ($type !== self::TYPE_LIST) {
throw new BadRequest("Not supported type.");
}

93
application/Espo/Tools/Layout/Service.php
View File

@@ -85,10 +85,8 @@ class Service
$result = Json::decode($data);
}
if ($result === false) {
if ($name === 'bottomPanelsDetail') {
return $this->getOriginalBottomPanelsDetail($scope);
}
if ($result === false && $name === 'bottomPanelsDetail') {
return $this->getOriginalBottomPanelsDetail($scope);
}
return $result;
@@ -112,35 +110,32 @@ class Service
$layoutSetId = null;
$data = null;
$em = $this->entityManager;
$user = $this->user;
if ($user->isPortal()) {
$portalId = $user->get('portalId');
if ($this->user->isPortal()) {
$portalId = $this->user->getPortalId();
if ($portalId) {
$portal = $em
$portal = $this->entityManager
->getRDBRepositoryByClass(Portal::class)
->select(['layoutSetId'])
->where(['id' => $portalId])
->findOne();
if ($portal) {
$layoutSetId = $portal->get('layoutSetId');
$layoutSetId = $portal->getLayoutSet()?->getId();
}
}
} else {
$teamId = $user->get('defaultTeamId');
$teamId = $this->user->getDefaultTeam()?->getId();
if ($teamId) {
$team = $em
$team = $this->entityManager
->getRDBRepositoryByClass(Team::class)
->select(['layoutSetId'])
->where(['id' => $teamId])
->findOne();
if ($team) {
$layoutSetId = $team->get('layoutSetId');
$layoutSetId = $team->getLayoutSet()?->getId();
}
}
}
@@ -148,15 +143,16 @@ class Service
if ($layoutSetId) {
$nameReal = $name;
if ($user->isPortal()) {
if (str_ends_with($name, 'Portal')) {
$nameReal = substr($name, 0, -6);
}
if (
$this->user->isPortal() &&
str_ends_with($name, 'Portal')
) {
$nameReal = substr($name, 0, -6);
}
$layout = $this->getRecordFromSet($scope, $nameReal, $layoutSetId, true);
$data = $layout?->get('data');
$data = $layout?->getData();
}
if (!$data) {
@@ -169,36 +165,35 @@ class Service
throw new NotFound("Layout $scope:$name is not found.");
}
if (!$this->user->isAdmin()) {
if ($name === 'relationships') {
if (is_array($data)) {
foreach ($data as $i => $item) {
$link = $item;
if (
!$this->user->isAdmin() &&
$name === 'relationships' &&
is_array($data)
) {
foreach ($data as $i => $item) {
$link = $item;
if (is_object($item)) {
/** @var stdClass $item */
$link = $item->name ?? null;
}
if (is_object($item)) {
/** @var stdClass $item */
$link = $item->name ?? null;
}
$foreignEntityType = $this->metadata
->get(['entityDefs', $scope, 'links', $link, 'entity']);
$foreignEntityType = $this->metadata
->get(['entityDefs', $scope, 'links', $link, 'entity']);
if ($foreignEntityType) {
if (!$this->acl->tryCheck($foreignEntityType)) {
unset($data[$i]);
}
}
}
$data = array_values($data);
if (
$foreignEntityType &&
!$this->acl->tryCheck($foreignEntityType)
) {
unset($data[$i]);
}
}
$data = array_values($data);
}
if ($data === false) {
if ($name === 'bottomPanelsDetail') {
return $this->getForFrontendBottomPanelsDetail($scope);
}
if ($data === false && $name === 'bottomPanelsDetail') {
return $this->getForFrontendBottomPanelsDetail($scope);
}
return $data;
@@ -207,26 +202,24 @@ class Service
/**
* @throws NotFound
*/
protected function getRecordFromSet(
private function getRecordFromSet(
string $scope,
string $name,
string $setId,
bool $skipCheck = false
): ?LayoutRecord {
$entityManager = $this->entityManager;
$layoutSet = $entityManager->getEntityById(LayoutSet::ENTITY_TYPE, $setId);
$layoutSet = $this->entityManager
->getRDBRepositoryByClass(LayoutSet::class)
->getById($setId);
if (!$layoutSet) {
throw new NotFound("LayoutSet $setId not found.");
}
$layoutList = $layoutSet->get('layoutList') ?? [];
$fullName = $scope . '.' . $name;
if (!in_array($fullName, $layoutList)) {
if (!in_array($fullName, $layoutSet->getLayoutList())) {
if ($skipCheck) {
return null;
}
@@ -234,7 +227,7 @@ class Service
throw new NotFound("Layout $fullName is no allowed in set.");
}
return $entityManager
return $this->entityManager
->getRDBRepositoryByClass(LayoutRecord::class)
->where([
'layoutSetId' => $setId,