From b00386eed5c3d14b707ab26117204e9a760cb490 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Tue, 9 Apr 2019 16:04:08 +0200
Subject: [PATCH] fix object relation tree
---
.../recordcontainers/jdito/contentProcess.js | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 565597b0b45..fe657ea0e68 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.db");
import("system.translate");
import("system.result");
@@ -50,7 +51,7 @@ else
result.object(tree);
-function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData, pObjectRelationId)
+function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId, pNodeId, pLayer, pRelationTypeData)
{
// prevent stack overflows
if (pLayer > 30)
@@ -68,12 +69,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
{
if (pLayer == 0)
{
- // load only one ObjectRelation (e.g. for edit mode)
- if (pObjectRelationId)
- {
-
- }
- else if (pObjectRelationTypeId)
+ if (pObjectRelationTypeId)
{
let relationTypeData = ObjectRelationUtils.getRelationType(pObjectRelationTypeId);
@@ -166,7 +162,7 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
if (direction == "same")
{
var otherEntryData = _getEntryData(pNodeId[0], "normal", relationType1, relationType2, prevObjectId, true);
- uids.concat(_insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 1));
+ _insertEntry(tree, otherEntryData, pNodeId, pLayer, destObjectType, thisRelationTypeId, 1);
}
}
}
--
GitLab