Merge branch '1047858_UnlinkedMailDSGVO' into '2020.0'

[Projekt: Entwicklung - Neon][TicketNr.: 1047858][DSGVO: Zustimmung bei...

See merge request xrm/basic!138

(cherry picked from commit 89e6029b)

65e9711f [Projekt: Entwicklung - Neon][TicketNr.: 1047858][DSGVO: Zustimmung bei...
b752af10 [Projekt: Entwicklung - Neon][TicketNr.: 1047858][DSGVO: Zustimmung bei...

entity/UnlinkedMailMappingWrapper_entity/entityfields/mailastext_param/valueProcess.js

@@ -9,7 +9,7 @@ if (unlinkedMailId)
 {
     res = newSelect("AB_UNLINKEDMAIL.MAIL")
                             .from("AB_UNLINKEDMAIL")
-                            .and("AB_UNLINKEDMAIL.AB_UNLINKEDMAILID", unlinkedMailId)
+                            .where("AB_UNLINKEDMAIL.AB_UNLINKEDMAILID", unlinkedMailId)
                             .cell();
 }
 result.string(res);
\ No newline at end of file

entity/UnlinkedMailMappingWrapper_entity/recordcontainers/dummyjdito/onUpdate.js

+import("DataPrivacy_lib");
 import("system.datetime");
 import("KeywordRegistry_basic");
 import("system.util");
@@ -65,6 +66,9 @@ var activityRes = incomingMailExec.createActivity(activityLinks);
 incomingMailExec.deleteUnlinkedMail(unlinkedMailId);
 
 if (communicationsToInsert.length > 0)
+{
     db.inserts(communicationsToInsert);
+    DataPrivacyUtils.notifyNeedDataPrivacyUpdate();
+}
 
 neon.refreshAll();//this is needed for the dashboard: other elements are refreshed and display for example unlinkedMails
\ No newline at end of file

process/DataPrivacy_lib/process.js

@@ -436,7 +436,8 @@ DataPrivacyUtils.collectAll = function(pContactId, pFilterCond)
  * Notify the user to update the data privacy informations.
  * It is only displayed if it is a Person.
  * 
- * @param {String} pContactId the current contactId
+ * @param {String} [pContactId] contactId that is used to vertify whether the contact is a person-contact (-> showmessage) 
+ * or not (-> do not show message), if param is null (-> show message without this check)
  * @param {Boolean} pShowMessage if false: nothing happens
  * 
  * @return {void}
@@ -449,8 +450,8 @@ DataPrivacyUtils.notifyNeedDataPrivacyUpdate = function(pContactId, pShowMessage
     var isActive = JSON.parse(project.getPreferenceValue("custom.dsgvo.active", "true"));
     if (!isActive)
         return;
- 
-    if (ContactUtils.getContactTypeByContactId(pContactId) > 1) { // if person
+    
+    if (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"));
     }

process/IncomingEmailExecutor_lib/process.js

@@ -204,7 +204,7 @@ IncomingEmailExecutor.prototype.createActivity = function(pAdditionalLinks)
 
 IncomingEmailExecutor.prototype.deleteUnlinkedMail = function (pUnlinkedMailId)
 {
-    newWhere("AB_UNLINKEDMAIL.AB_UNLINKEDMAILID", pUnlinkedMailId, undefined, undefined, this._alias)
+    newWhereIfSet("AB_UNLINKEDMAIL.AB_UNLINKEDMAILID", pUnlinkedMailId, undefined, undefined, this._alias)
         .deleteData(true, "AB_UNLINKEDMAIL");
 }