From ba0e1eb36afaab052e4e5370e733f6360db6c60c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Fri, 26 Jul 2019 07:03:33 +0200
Subject: [PATCH] Calendar: Fixes for Exchange
---
.../entityfields/deleteseries/stateProcess.js | 2 +-
.../recordcontainers/jdito/contentProcess.js | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js b/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js
index a0efe219b1..f30fe6d0c2 100644
--- a/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js
+++ b/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js
@@ -14,7 +14,7 @@ if(event) //event not empty
var ownerCn = event[calendars.ORGANIZER2]["cn"];
var currentUserTitle = vars.getString("$sys.user");
- if(event[calendars.RECURRENCEID] && ownerCn == currentUserTitle) //serientermin und currentUser der TerminOwner
+ if((event[calendars.RECURRENCEID] && ownerCn == currentUserTitle) || calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS) //serientermin und currentUser der TerminOwner
result.object(neon.COMPONENTSTATE_AUTO);
else
result.object(neon.COMPONENTSTATE_INVISIBLE);
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 0499835a64..2d95082b91 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -13,6 +13,8 @@ import("system.entities")
var cond = SqlCondition.begin();
+var appointmentUids;
+var idscond;
if(vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
{
@@ -25,9 +27,9 @@ else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
var contactid = tools.getCurrentUser()["params"]["contactID"];
cond.andPrepareIfSet("AB_APPOINTMENTLINK.OBJECT_ROWID", contactid)
- let idscond = db.translateCondition(cond.build("1 = 1"));
+ idscond = db.translateCondition(cond.build("1 = 1"));
- let appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
+ appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
result.object(buildEntriesFromUids(appointmentUids));
}
@@ -37,9 +39,9 @@ else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
else if(vars.getString("$param.LinkedObjectId_param") != undefined)
{
cond.andPrepareVars("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
- let idscond = db.translateCondition(cond.build("1 = 1"));
+ idscond = db.translateCondition(cond.build("1 = 1"));
- let appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
+ appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
result.object(buildEntriesFromUids(appointmentUids));
}
/**
--
GitLab