From c4e009b421b9a15368c98950427b3f267e2e9976 Mon Sep 17 00:00:00 2001 From: "a.schindlbeck" <a.schindlbeck@adito.de> Date: Thu, 29 Nov 2018 17:44:24 +0100 Subject: [PATCH] AppointmentPreviewView Zusatzcontent --- entity/Appointment_entity/contentProcess.js | 2 +- .../entityfields/attendees/possibleItemsProcess.js | 3 --- neonView/AppointmentPreview_view/AppointmentPreview_view.aod | 1 + .../_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/entity/Appointment_entity/contentProcess.js b/entity/Appointment_entity/contentProcess.js index 20584de9f7b..71a32131c78 100644 --- a/entity/Appointment_entity/contentProcess.js +++ b/entity/Appointment_entity/contentProcess.js @@ -15,7 +15,7 @@ if(vars.exists("$param.entry")) masterEntry = JSON.parse(vars.get("$param.masterEntry")); } - logging.log("Appointment is recurrence exception: " + (masterEntry != null)) + //logging.log("Appointment is recurrence exception: " + (masterEntry != null)) var uid = entry[calendars.ID]; var summary = entry[calendars.SUMMARY]; diff --git a/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js b/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js index 1351b2e0f18..36c1c541893 100644 --- a/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js +++ b/entity/Appointment_entity/entityfields/attendees/possibleItemsProcess.js @@ -3,8 +3,6 @@ import("system.logging"); import("system.result"); import("system.calendars"); -logging.log("attendees poss-items") - var entry = JSON.parse(vars.getString("param.entry")); var allUsers = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE); var results = []; @@ -13,6 +11,5 @@ for (var i = 0; i < allUsers.length; i++) { results[i] = [allUsers[i][0], allUsers[i][2].paramvalue]; } -logging.log(results); result.object(results); \ No newline at end of file diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod index d8ed98ea586..e5e0b087586 100644 --- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod +++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod @@ -22,6 +22,7 @@ <locationField>LOCATION</locationField> <organizerField>ORGANIZER</organizerField> <categoriesField>CATEGORIES</categoriesField> + <favoriteActionGroup1>PartStatActionGroup</favoriteActionGroup1> <entityField>#ENTITY</entityField> </appointmentPreviewViewTemplate> </children> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index 473ef689d83..1ea4864f5a7 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod @@ -2,7 +2,7 @@ <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1"> <name>_____PREFERENCES_PROJECT</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <projectName>xRM-Basic5</projectName> + <projectName>xRM-Basic-5-1</projectName> <jditoMaxContentSize v="57671680" /> <calendarCategoriesEvent> <entry> -- GitLab