From 9befcb73cb1187e2b6ccdef3a02e46c1047bdaeb Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Tue, 19 Mar 2019 13:07:57 +0100
Subject: [PATCH] ActivityLink / TaskLink fix
---
.../entityfields/object_rowid/displayValueProcess.js | 2 +-
.../entityfields/object_type/displayValueProcess.js | 2 +-
entity/Offer_entity/Offer_entity.aod | 1 +
.../entityfields/object_rowid/displayValueProcess.js | 2 +-
.../entityfields/object_type/displayValueProcess.js | 2 +-
process/Offer_lib/process.js | 1 -
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js b/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
index 8f989ba5e7..8b080bceea 100644
--- a/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
@@ -4,7 +4,7 @@ import("system.db");
import("system.result");
import("Context_lib");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
result.string("");
} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
diff --git a/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js b/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
index 811b2e2fbd..2965221e0b 100644
--- a/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.neon");
import("system.vars");
import("system.project");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE")) {
result.string("");
} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"))[1]);
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 0d7b40fd2c..d44fce6a94 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -590,6 +590,7 @@
</entityField>
<entityConsumer>
<name>Attributes</name>
+ <title>Attributes</title>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js b/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
index 53702f2de5..9f4a7f9bd3 100644
--- a/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
@@ -4,7 +4,7 @@ import("system.db");
import("system.result");
import("Context_lib");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID")) {
result.string("");
}else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE")) {
result.string(db.cell(ContextUtils.getNameSql(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"))));
diff --git a/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js b/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js
index ca1596de14..523cf8406f 100644
--- a/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js
+++ b/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.neon");
import("system.vars");
import("system.project");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_TYPE")) {
result.string("");
} else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
{
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 18a4d3b310..084653a597 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.util");
import("system.datetime");
--
GitLab