From 0a4999bcee4692e920542b49b80f777373b0cfdc Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Thu, 27 May 2021 15:07:16 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-ContactManagement][TicketNr.:?=
=?UTF-8?q?=201081078][DSGVO=20erzeugt=20Meldung=20am=20Client=20auch=20we?=
=?UTF-8?q?nn=20es=20am=20server=20ausgef=C3=BChrt=20wird]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Address_entity/recordcontainers/db/onDBInsert.js | 2 +-
.../Address_entity/recordcontainers/db/onDBUpdate.js | 2 +-
.../recordcontainers/db/onDBInsert.js | 2 +-
.../recordcontainers/db/onDBUpdate.js | 2 +-
process/DataPrivacy_lib/process.js | 10 ++++++++--
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/entity/Address_entity/recordcontainers/db/onDBInsert.js b/entity/Address_entity/recordcontainers/db/onDBInsert.js
index b088c7a1b3..0ea7d49858 100644
--- a/entity/Address_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Address_entity/recordcontainers/db/onDBInsert.js
@@ -49,7 +49,7 @@ if(scopeType == "Organisation")
}
}
-if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false" && vars.get("$sys.isclient"))
+if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false")
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
diff --git a/entity/Address_entity/recordcontainers/db/onDBUpdate.js b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
index 8ce04bc6f3..870d5a7533 100644
--- a/entity/Address_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Address_entity/recordcontainers/db/onDBUpdate.js
@@ -7,7 +7,7 @@ import("DataPrivacy_lib");
var rowdata = vars.get("$local.rowdata");
-if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false" && vars.get("$sys.isclient"))
+if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false")
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
diff --git a/entity/Communication_entity/recordcontainers/db/onDBInsert.js b/entity/Communication_entity/recordcontainers/db/onDBInsert.js
index 7d836ae39e..b78d0ded2a 100644
--- a/entity/Communication_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Communication_entity/recordcontainers/db/onDBInsert.js
@@ -11,7 +11,7 @@ var rowdata = vars.get("$local.rowdata");
var standard = new StandardObject("Communication", vars.get("$local.uid"), "Person", rowdata["COMMUNICATION.CONTACT_ID"])
standard.onCommunicationInsert(rowdata["COMMUNICATION.MEDIUM_ID"]);
-if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false" && vars.get("$sys.isclient"))
+if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false")
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
diff --git a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
index ebf288114b..1b8a0279c1 100644
--- a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
@@ -11,7 +11,7 @@ if (rowdata["COMMUNICATION.CONTACT_ID"] != null)
standard.onCommunicationUpdate(rowdata["COMMUNICATION.MEDIUM_ID"]);
}
-if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false" && vars.get("$sys.isclient"))
+if(vars.exists("$context.PushDataPrivacyNotification") && vars.get("$context.PushDataPrivacyNotification") == "false")
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.CONTACT_ID"], vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index c7c004a2ce..4e9ddfc604 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -485,13 +485,19 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
DataPrivacyUtils.notifyNeedDataPrivacyUpdate = function(pContactId, pShowMessage)
{
if (pShowMessage == "false" || pShowMessage === false)
+ {
return;
+ }
+
var isActive = JSON.parse(project.getPreferenceValue("custom.dsgvo.active", "true"));
if (!isActive)
- return;
+ {
+ return;
+ }
- if (pContactId == undefined || ContactUtils.getContactTypeByContactId(pContactId) > 1) { // if person
+ if (Utils.toBoolean(vars.get("$sys.isclient")) && (pContactId == undefined || ContactUtils.getContactTypeByContactId(pContactId) > 1))// if person
+ {
// TODO: jump to DataPrivacy-Tab of contact
question.showMessage(translate.text("Your changes may have an impact on the data privacy information (GDPR).\n Please update these."), question.INFORMATION, translate.text("Update data privacy information"));
}
--
GitLab