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

#1060919 Kalender: linked Appointments bugfixing

parent 460bb74f
No related branches found
No related tags found
No related merge requests found
......@@ -2,6 +2,10 @@ import("system.vars");
import("system.result");
import("system.calendars");
import("system.text");
import("system.tools");
var owner = text.decodeMS(JSON.parse(vars.get("$param.Entry_param"))["h"])[1].split(":")[1];
result.string(calendars.hasPermission([owner], calendars.VEVENT, "WRITE"));
\ No newline at end of file
var user = tools.getCurrentUser();
var calUser = calendars.getCalendarUser(user["title"]);
var calUserCn = text.decodeMS(calUser)[1].split(":")[1];
result.string(calendars.hasPermission(calUserCn, calendars.VEVENT, "WRITE"));
\ No newline at end of file
......@@ -2,7 +2,13 @@ import("system.vars");
import("system.result");
import("system.calendars");
import("system.text");
import("system.tools");
import("system.logging");
var owner = text.decodeMS(JSON.parse(vars.get("$param.Entry_param"))["h"])[1].split(":")[1];
result.string(calendars.hasPermission([owner], calendars.VEVENT, "WRITE"));
var user = tools.getCurrentUser();
var calUser = calendars.getCalendarUser(user["title"]);
var calUserCn = text.decodeMS(calUser)[1].split(":")[1];
var permitted = calendars.hasPermission(calUserCn, calendars.VEVENT, "WRITE");
result.string(permitted);
......@@ -9,6 +9,7 @@ import("system.datetime");
import("system.eMath");
import("system.util");
import("system.neon");
import("system.text");
var appointmentSelect = newSelect("APPOINTMENT_ID").from("AB_APPOINTMENTLINK");
var appointmentUids;
......@@ -77,7 +78,7 @@ function buildEntry(pEntry, pMasterentry)
if(pEntry[calendars.ORGANIZER2] != undefined)
var organizer = pEntry[calendars.ORGANIZER2]["paramvalue"];
if(pEntry[calendars.USER2] != undefined)
var owner = pEntry[calendars.USER2]["paramvalue"];
var owner = JSON.stringify(pEntry[calendars.USER2]);
var status = pEntry[calendars.STATUS];
var location = pEntry[calendars.LOCATION];
var reminder = pEntry[calendars.REMINDER_DURATION];
......
import("system.logging");
import("Sql_lib");
import("system.neon");
import("system.calendars");
import("system.vars");
if (vars.exists("$param.Entry_param"))
var uid;
if (vars.get("$param.Entry_param") != null)
{
var entry = JSON.parse(vars.getString("$param.Entry_param"));
var reccurenceid = entry[calendars.RECURRENCEID];
if (reccurenceid == undefined)
reccurenceid = null;
calendars.removeEntryByUID(calendars.VEVENT, entry[calendars.USER2]["cn"], entry[calendars.ID], reccurenceid)
uid = entry[calendars.ID];
calendars.removeEntryByUID(calendars.VEVENT, entry[calendars.USER2]["cn"], uid, reccurenceid);
}
else if(vars.get("$field.OWNER"))
{
uid = vars.get("$field.UID");
calendars.removeEntryByUID(calendars.VEVENT, JSON.parse(vars.get("$field.OWNER"))["cn"], uid, vars.get("$field.RECURRENCEID"));
}
/**
* Deletes ApointmentLinks referring to the deleted Appointment.
*/
newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", entry[calendars.ID])
.deleteData();
}
\ No newline at end of file
newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", uid)
.deleteData();
\ No newline at end of file
......@@ -29,7 +29,7 @@
<timelineViewTemplate>
<name>NotificationTimeline</name>
<favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
<dateField>CREATIONDATE</dateField>
<dateField>CREATEDATE</dateField>
<titleField>CAPTION</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconIdField>ICON</iconIdField>
......
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