From bf93474065ee396d8f7f8ec1e78206ce12b0899e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 28 Oct 2019 14:08:23 +0100
Subject: [PATCH] bugfix bei Modulen in 360 grad ohne aktiv-status
---
process/Context_lib/process.js | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 877b1cf2c0..c652ab9089 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -588,10 +588,13 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
var condSub = SqlCondition.begin();
activeStates.forEach(function (state)
{
- if(pActive)
- condSub.orPrepare(ownContextSelector.getFullField(ownContextSelector.stateField), state)
- else
- condSub.andPrepare(ownContextSelector.getFullField(ownContextSelector.stateField), state, "# != ?")
+ if (ownContextSelector.stateField)
+ {
+ if(pActive)
+ condSub.orPrepare(ownContextSelector.getFullField(ownContextSelector.stateField), state)
+ else
+ condSub.andPrepare(ownContextSelector.getFullField(ownContextSelector.stateField), state, "# != ?")
+ }
});
cond.andSqlCondition(condSub);
}
@@ -614,7 +617,12 @@ 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 = ", ''";
+ }
if (ownContextSelector.condition)
cond.andSqlCondition(ownContextSelector.condition);
var res = cond.buildSql("select " + ownContextSelector.getFullIdField() + ", " + ownContextSelector.titleExpression + dateColumn + stateColumn
--
GitLab