fixes
This commit is contained in:
@@ -315,6 +315,8 @@ class Processor
|
||||
return;
|
||||
}
|
||||
|
||||
$parent = null;
|
||||
|
||||
$parentId = $note->get('parentId');
|
||||
$parentType = $note->get('parentType');
|
||||
|
||||
|
||||
@@ -806,6 +806,9 @@ class EntityManager
|
||||
$label = $params['label'];
|
||||
$labelForeign = $params['labelForeign'];
|
||||
|
||||
$relationName = null;
|
||||
$dataRight = null;
|
||||
|
||||
if ($linkType === 'manyToMany') {
|
||||
if (!empty($params['relationName'])) {
|
||||
$relationName = $params['relationName'];
|
||||
@@ -1410,9 +1413,9 @@ class EntityManager
|
||||
$this->language->set($entity, 'links', $link, $label);
|
||||
}
|
||||
|
||||
if ($linkType !== 'belongsToParent') {
|
||||
$labelForeign = null;
|
||||
$labelForeign = null;
|
||||
|
||||
if ($linkType !== 'belongsToParent') {
|
||||
if (isset($params['labelForeign'])) {
|
||||
$labelForeign = $params['labelForeign'];
|
||||
}
|
||||
|
||||
@@ -360,6 +360,8 @@ class Xlsx implements Processor
|
||||
$foreignField = $name;
|
||||
$linkName = null;
|
||||
|
||||
$foreignScope = null;
|
||||
|
||||
if (strpos($name, '_') !== false) {
|
||||
list($linkName, $foreignField) = explode('_', $name);
|
||||
|
||||
|
||||
@@ -380,8 +380,6 @@ class Import
|
||||
|
||||
private function importRow(array $attributeList, array $row): ?stdClass
|
||||
{
|
||||
$id = null;
|
||||
|
||||
$params = $this->params;
|
||||
|
||||
$action = $params->getAction() ?? self::DEFAULT_ACTION;
|
||||
@@ -390,10 +388,10 @@ class Import
|
||||
return null;
|
||||
}
|
||||
|
||||
if (in_array($action, [Params::ACTION_CREATE_AND_UPDATE, Params::ACTION_UPDATE])) {
|
||||
$updateByAttributeList = [];
|
||||
$whereClause = [];
|
||||
$updateByAttributeList = [];
|
||||
$whereClause = [];
|
||||
|
||||
if (in_array($action, [Params::ACTION_CREATE_AND_UPDATE, Params::ACTION_UPDATE])) {
|
||||
$updateBy = $params->getUpdateBy();
|
||||
|
||||
if (count($updateBy)) {
|
||||
|
||||
@@ -128,6 +128,9 @@ class NoteHookProcessor
|
||||
// This is correct.
|
||||
$skipAclCheck = !$note->isAclProcessed();
|
||||
|
||||
$teamIdList = null;
|
||||
$userIdList = null;
|
||||
|
||||
if (!$skipAclCheck) {
|
||||
$teamIdList = $note->getLinkMultipleIdList('teams');
|
||||
$userIdList = $note->getLinkMultipleIdList('users');
|
||||
@@ -267,6 +270,8 @@ class NoteHookProcessor
|
||||
return;
|
||||
}
|
||||
|
||||
$notifyUserIdList = [];
|
||||
|
||||
foreach ($targetTeamIdList as $teamId) {
|
||||
$team = $this->entityManager->getEntity(Team::ENTITY_TYPE, $teamId);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user