#1058829: Apply demanded changes

entity/Campaign_entity/recordcontainers/db/conditionProcess.js

@@ -9,12 +9,11 @@ if(vars.get("$param.ShowOnlyCurrentUsersCampaigns_param") == 'true')
 {
     //TODO: use a preparedCondition (.build instead of .translate) when available #1030812 #1034026
     result.string(newWhere("CAMPAIGN.EMPLOYEE_CONTACT_ID", EmployeeUtils.getCurrentContactId()).toString());
-}
+} else {
+    var condition = new SqlBuilder()
+        .whereIfSet("STEPDATESTART_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+        .andIfSet("STEPDATEEND_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+        ;
 
-
-var condition = new SqlBuilder()
-    .whereIfSet("STEPDATESTART_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
-    .andIfSet("STEPDATEEND_TABLEALIAS.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
-    ;
-
-result.string(condition.toString());
+    result.string(condition.toString());
+}
\ No newline at end of file

entity/Campaign_entity/recordcontainers/db/filterextensions/member_filter/filterValuesProcess.js

@@ -6,8 +6,8 @@ import("Person_lib");
 var query = new SqlBuilder()
     .select("OBJECTMEMBER.CONTACT_ID, (" + PersUtils.getResolvingDisplaySubSql("OBJECTMEMBER.CONTACT_ID") + ") as C")
     .from("OBJECTMEMBER")
-    .join("CAMPAIGN on OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID", "", "", "inner")
-    .join("CONTACT on OBJECTMEMBER.CONTACT_ID = CONTACT.CONTACTID", "", "", "inner")
+    .join("CAMPAIGN", "OBJECTMEMBER.OBJECT_ROWID = CAMPAIGN.CAMPAIGNID")
+    .join("CONTACT", "OBJECTMEMBER.CONTACT_ID = CONTACT.CONTACTID")
     ;
     
 result.object(query.table());
\ No newline at end of file