From 44e65555fc1c360b4f78d730b413621e3c73e18f Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@ASCHINDLBECK.aditosoftware.local>
Date: Fri, 29 May 2020 11:24:03 +0200
Subject: [PATCH] #1056803 CalendarPermissions work in Neon
---
entity/Appointment_entity/Appointment_entity.aod | 6 ++++++
.../recordcontainers/jdito/contentProcess.js | 3 +++
neonView/AppointmentEdit_view/AppointmentEdit_view.aod | 2 ++
.../AppointmentPreview_view/AppointmentPreview_view.aod | 2 ++
4 files changed, 13 insertions(+)
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 8b3f481d0a..441da772bf 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -247,6 +247,9 @@
<entityField>
<name>STATUS_ACTION</name>
</entityField>
+ <entityField>
+ <name>OWNER</name>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -278,6 +281,9 @@
<jDitoRecordFieldMapping>
<name>ORGANIZER.value</name>
</jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OWNER.value</name>
+ </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>ATTENDEES.value</name>
</jDitoRecordFieldMapping>
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index ee80cd3135..1537137ac8 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -75,6 +75,8 @@ function buildEntry(pEntry, pMasterentry)
var description = pEntry[calendars.DESCRIPTION];
if(pEntry[calendars.ORGANIZER2] != undefined)
var organizer = pEntry[calendars.ORGANIZER2]["paramvalue"];
+ if(pEntry[calendars.USER2] != undefined)
+ var owner = pEntry[calendars.USER2]["paramvalue"];
var status = pEntry[calendars.STATUS];
var location = pEntry[calendars.LOCATION];
var reminder = pEntry[calendars.REMINDER_DURATION];
@@ -103,6 +105,7 @@ function buildEntry(pEntry, pMasterentry)
enddate,
summary,
organizer,
+ owner,
attendees,
status,
links,
diff --git a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
index 9490ed3a36..5b5def3ba1 100644
--- a/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
+++ b/neonView/AppointmentEdit_view/AppointmentEdit_view.aod
@@ -11,6 +11,7 @@
<children>
<appointmentEditViewTemplate>
<name>Edit</name>
+ <uidField>UID</uidField>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
@@ -23,6 +24,7 @@
<alldayField>ALLDAY</alldayField>
<transparencyField>TRANSPARENCY</transparencyField>
<organizerField>ORGANIZER</organizerField>
+ <ownerField>OWNER</ownerField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<rruleField>RRULE</rruleField>
<recurrenceIdField>RECURRENCEID</recurrenceIdField>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index baf79830ac..23c9de063b 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -11,6 +11,7 @@
<children>
<appointmentPreviewViewTemplate>
<name>Appointments</name>
+ <uidField>UID</uidField>
<summaryField>SUMMARY</summaryField>
<descriptionField>DESCRIPTION</descriptionField>
<beginField>BEGIN</beginField>
@@ -24,6 +25,7 @@
<locationField>LOCATION</locationField>
<linkField>LINKS</linkField>
<organizerField>ORGANIZER</organizerField>
+ <ownerField>OWNER</ownerField>
<categoriesField>CATEGORIES</categoriesField>
<favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>seriesActionGroup</favoriteActionGroup2>
--
GitLab