Skip to content
Snippets Groups Projects
Commit b00386ee authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

fix object relation tree

parent 9a767a9d
No related branches found
No related tags found
No related merge requests found
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);
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment