Skip to content
Snippets Groups Projects
Commit 0a4999bc authored by Sebastian Pongratz's avatar Sebastian Pongratz :ping_pong:
Browse files

[Projekt: xRM-ContactManagement][TicketNr.: 1081078][DSGVO erzeugt Meldung am...

[Projekt: xRM-ContactManagement][TicketNr.: 1081078][DSGVO erzeugt Meldung am Client auch wenn es am server ausgeführt wird]
parent 49b2292f
No related branches found
No related tags found
No related merge requests found
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -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"));
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment