diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js index 877b1cf2c01a0afdd1eee2483cf2b94fc9bd249b..c652ab9089316e1c714accd56f1cf5affdb74720 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