From 40da77e5cfaf639e512877e0e1881a62e6b3e665 Mon Sep 17 00:00:00 2001
From: Tom Lutzenberger <t.lutzenberger@adito.de>
Date: Wed, 19 Aug 2020 14:06:07 +0200
Subject: [PATCH] #1058829: Cleanup
---
.../datestart_filter/filterConditionProcess.js | 1 -
.../recordcontainers/db/fromClauseProcess.js | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
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 4424653e1e0..2d15b9e58f2 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 ebb38fc05f1..5eec4c678e0 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);
--
GitLab