From d2edb93df0feffec6a3b802986ac578677ad8f0f Mon Sep 17 00:00:00 2001
From: Benjamin Ulrich <b.ulrich@adito.de>
Date: Thu, 8 Oct 2020 08:15:06 +0000
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
1061334][Object_entity - contentProcess]
---
.../Object_entity/recordcontainers/jdito/contentProcess.js | 4 ++--
process/Context_lib/process.js | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 67b5e68f5a..27b0b7e83a 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -19,8 +19,8 @@ if (vars.get("$param.ObjectType_param"))
if (vars.exists("$param.ContactId") && vars.get("$param.ContactId"))
contactId = vars.get("$param.ContactId");
- result.object(db.table(ContextUtils.getContextDataSql(objectType, contactId, false, undefined, false, excludedIds)))
-}
+ result.object(db.table(ContextUtils.getContextDataSql(objectType, contactId, false, undefined, false, null, null, excludedIds)))
+}
else
{
result.object([]);
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index f65180f1d1..31d6082843 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -662,7 +662,7 @@ ContextUtils.getContactId = function(pContextId, pRowId)
* nur 360
*
*/
-ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pWithGroupBy, pUidsForFiltering)
+ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pWithGroupBy, pUidsForFiltering, pExcludeIds)
{
var selectMap = ContextUtils.getSelectMap();
var ownContextSelector = selectMap[pContextId];
@@ -690,7 +690,8 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
var contextDataSelect = newSelect( columns.join(", ") )
.from(ownContextSelector.getFullFromClause())
.where(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId, SqlBuilder.IN())
- .andIfSet(ownContextSelector.getFullIdField(), pUidsForFiltering, SqlBuilder.IN());
+ .andIfSet(ownContextSelector.getFullIdField(), pUidsForFiltering, SqlBuilder.IN())
+ .andIfSet(ownContextSelector.getFullIdField(), pExcludeIds, SqlBuilder.NOT_IN());
if (pActive != undefined)
{
--
GitLab