diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js index c0f9856047b82a2eb6660c16f5581f53beeb64be..793ff376e29af696557d3c99408415745398b23c 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); }