Skip to content
Snippets Groups Projects
Commit ba0e1eb3 authored by Andreas Schindlbeck's avatar Andreas Schindlbeck
Browse files

Calendar: Fixes for Exchange

parent da97e813
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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));
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment