From 0596d8e9184108f6bab4b99cc26755f58e567fe9 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 1 Feb 2019 14:41:35 +0100
Subject: [PATCH] =?UTF-8?q?Namen=20auch=20in=20Hisstorylink=20aufl=C3=B6se?=
=?UTF-8?q?n=20mit=20selbem=20Mechanismus=20wie=20object=20relations?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/ActivityLink_entity/ActivityLink_entity.aod | 2 +-
.../object_rowid.displayvalue/expression.js | 4 ++++
process/ObjectRelation_lib/ObjectRelation_lib.aod | 9 ---------
process/ObjectRelation_lib/process.js | 14 --------------
4 files changed, 5 insertions(+), 24 deletions(-)
create mode 100644 entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
delete mode 100644 process/ObjectRelation_lib/ObjectRelation_lib.aod
delete mode 100644 process/ObjectRelation_lib/process.js
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 33fd4236239..91bc2dfdf66 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -113,7 +113,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ROWID.displayValue</name>
- <recordfield>ACTIVITYLINK.OBJECT_TYPE</recordfield>
+ <expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js b/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
new file mode 100644
index 00000000000..33554680ccc
--- /dev/null
+++ b/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getNameSubselectSql("OBJECT_TYPE", "OBJECT_ROWID"))
\ No newline at end of file
diff --git a/process/ObjectRelation_lib/ObjectRelation_lib.aod b/process/ObjectRelation_lib/ObjectRelation_lib.aod
deleted file mode 100644
index 77cc2f184e4..00000000000
--- a/process/ObjectRelation_lib/ObjectRelation_lib.aod
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
- <name>ObjectRelation_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/ObjectRelation_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
diff --git a/process/ObjectRelation_lib/process.js b/process/ObjectRelation_lib/process.js
deleted file mode 100644
index 9a4604f1bfb..00000000000
--- a/process/ObjectRelation_lib/process.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.vars");
-import("Context_lib");
-import("Sql_lib");
-
-/**
- * This class provides functions for managing object relations
- *
- * Do not create an instance of this
- *
- * @class
- */
-function ObjectRelationUtils() {}
-
-// TODO
\ No newline at end of file
--
GitLab