From 5054dcfa265ac5ccc87d50590d10083cd6f4c89e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 28 Oct 2019 13:54:38 +0100
Subject: [PATCH] bugfix bei Modulen in 360 grad ohne aktiv-status
---
process/Context_lib/process.js | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index c0f9856047..793ff376e2 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -595,7 +595,13 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
dateColumn = ", " + (ownContextSelector.getFullField(ownContextSelector.creationDateField) || "''");
var stateColumn = "";
if (pWithState === true)
- stateColumn = ", " + (ownContextSelector.getFullField(ownContextSelector.stateField) || "''");
+ {
+ if (ownContextSelector.stateField)
+ stateColumn = ", " + (ownContextSelector.getFullField(ownContextSelector.stateField) || "''");
+ else
+ stateColumn = ", ''";
+ }
+
var contextDataSelect = newSelect(ownContextSelector.getFullIdField() + ", " + ownContextSelector.titleExpression + dateColumn + stateColumn)
@@ -615,10 +621,14 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
var condSub = newWhere();
activeStates.forEach(function (state)
{
- if(pActive)
- condSub.or(ownContextSelector.getFullField(ownContextSelector.stateField), state)
- else
- condSub.and(ownContextSelector.getFullField(ownContextSelector.stateField), state, "# != ?")
+ if (ownContextSelector.stateField)
+ {
+ if(pActive)
+ condSub.or(ownContextSelector.getFullField(ownContextSelector.stateField), state)
+ else
+ condSub.and(ownContextSelector.getFullField(ownContextSelector.stateField), state, "# != ?")
+ }
+
});
contextDataSelect.andIfSet(condSub);
}
--
GitLab