diff --git a/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js index 4424653e1e066c3117ba607642bfe6cefcc93280..2d15b9e58f29554efe52a565d2033e5ba2f448ab 100644 --- a/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js +++ b/entity/Campaign_entity/recordcontainers/db/filterextensions/datestart_filter/filterConditionProcess.js @@ -1,6 +1,5 @@ import("system.result"); import("system.vars"); -import("system.logging"); import("Sql_lib"); import("Util_lib"); diff --git a/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js index ebb38fc05f112be76c496dd39d95960bc6b19784..5eec4c678e0303f56f160d22534f7c2fbe2bd302 100644 --- a/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js +++ b/entity/Campaign_entity/recordcontainers/db/fromClauseProcess.js @@ -4,13 +4,13 @@ import("system.vars"); var recordState = vars.get("$sys.recordstate"); +var res = "CAMPAIGN"; if (recordState != neon.OPERATINGSTATE_NEW && recordState != neon.OPERATINGSTATE_EDIT) { var subSelectDateStart = "(select min(DATE_START) as STEPDATESTART_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATESTART_TABLEALIAS"; var subSelectDateEnd = "(select max(DATE_END) as STEPDATEEND_ALIAS, CAMPAIGN_ID from CAMPAIGNSTEP group by CAMPAIGN_ID) as STEPDATEEND_TABLEALIAS"; - result.string("CAMPAIGN, " + subSelectDateStart + ", " + subSelectDateEnd); -} else { - result.string("CAMPAIGN"); + res += ", " + subSelectDateStart + ", " + subSelectDateEnd; } +result.string(res);