From 0ced5802900eb28b999257ea9e042426a5cd6c00 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Tue, 19 Mar 2019 11:12:49 +0100
Subject: [PATCH] Activity/TaskLink: return empty Display Value when
operatingState = NEW
---
.../entityfields/object_rowid/displayValueProcess.js | 8 ++++++--
.../entityfields/object_type/displayValueProcess.js | 5 +++--
.../entityfields/object_rowid/displayValueProcess.js | 8 ++++++--
.../entityfields/object_type/displayValueProcess.js | 6 ++++--
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js b/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
index 4bec272246..8f989ba5e7 100644
--- a/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js
@@ -1,7 +1,11 @@
+import("system.neon");
import("system.vars");
import("system.db");
import("system.result");
import("Context_lib");
-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"))));
\ No newline at end of file
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ 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"))));
+}
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js b/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
index c629c08823..811b2e2fbd 100644
--- a/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
+++ b/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js
@@ -3,7 +3,8 @@ import("system.neon");
import("system.vars");
import("system.project");
-if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
-{
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ 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]);
}
\ No newline at end of file
diff --git a/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js b/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
index 4bec272246..53702f2de5 100644
--- a/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js
@@ -1,7 +1,11 @@
+import("system.neon");
import("system.vars");
import("system.db");
import("system.result");
import("Context_lib");
-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"))));
\ No newline at end of file
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ 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"))));
+}
\ No newline at end of file
diff --git a/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js b/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js
index c629c08823..ca1596de14 100644
--- a/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js
+++ b/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js
@@ -3,7 +3,9 @@ import("system.neon");
import("system.vars");
import("system.project");
-if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ 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]);
-}
\ No newline at end of file
+}
\ No newline at end of file
--
GitLab