From dd1707d7daefc96ab02b339be1ea061db224b2f0 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 8 Apr 2019 15:55:19 +0200
Subject: [PATCH] bugfixes objectrelation
---
entity/ObjectTree_entity/ObjectTree_entity.aod | 2 +-
.../recordcontainers/jdito/contentProcess.js | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 9effca076ad..e4136413bd8 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -103,7 +103,7 @@
</entityField>
<entityField>
<name>TARGET_ID</name>
- <title>Object</title>
+ <title>Relation</title>
<consumer>Objects</consumer>
<linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
<searchable v="false" />
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 797fe1f60a5..a8f30c3c97b 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -22,9 +22,15 @@ else if(vars.exists("$local.idvalues") && vars.get("$local.idvalues") && vars.ge
if (uidParam)
{
let uid = JSON.parse(uidParam);
-
- let relationTypeData = ObjectRelationUtils.getRelationType(uid[2]);
- _insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10]);
+
+ let isObjectRelationNode = typeof uid[2] == "string";
+
+ if (isObjectRelationNode)
+ {
+ let relationTypeData = ObjectRelationUtils.getRelationType(uid[2]);
+ _insertEntry(tree, _getEntryData(uid[0], relationTypeData[3], relationTypeData[7], relationTypeData[8], undefined, false, uid[6]), "", 0, uid[3], relationTypeData[10]);
+
+ }
}
else
{
--
GitLab