diff --git a/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js b/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js index a0efe219b1305d4b2689f5787ac4b4f755373ed3..f30fe6d0c29cde5e4132ce5a57e4e93a38509bb9 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 0499835a647ad301bee4e604b05fa99b6fb5eb3f..2d95082b91c6b532bed64f995ff13141ad8c9c27 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)); } /**