From cd071a4bf8c9f4b817059f2a71ef7898aa376a5a Mon Sep 17 00:00:00 2001 From: "a.schindlbeck" <a.schindlbeck@adito.de> Date: Tue, 8 Jan 2019 08:50:39 +0100 Subject: [PATCH] Cal-changes --- entity/Appointment_entity/Appointment_entity.aod | 3 +-- entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod index 8c65a287ac..67d44eb8fb 100644 --- a/entity/Appointment_entity/Appointment_entity.aod +++ b/entity/Appointment_entity/Appointment_entity.aod @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.1.0"> +<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.1.1"> <name>Appointment_entity</name> <title>Termin</title> <majorModelMode>DISTRIBUTED</majorModelMode> @@ -57,7 +57,6 @@ <entityField> <name>CATEGORIES</name> <possibleItemsProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/possibleItemsProcess.js</possibleItemsProcess> - <newItemsAllowed v="true" /> <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/categories/valueProcess.js</valueProcess> </entityField> <entityField> diff --git a/entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js b/entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js index d58c694cc4..8daf50e782 100644 --- a/entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js +++ b/entity/Appointment_entity/recordcontainers/jditorc/onUpdate.js @@ -40,7 +40,8 @@ if(vars.exists("$param.entry")) } //event[calendars.AFFECTEDUSERS] = getAffectedUsers( event ); // calcrecurrence(event); - // if (event[calendars.RRULE] != undefined) recurrencend(event); + if (event[calendars.RRULE] != undefined) + recurrencend(event); // Links updaten //swing.saveTableEdit("$comp.links"); // Entweder jetzt neu anlegen oder nur updaten -- GitLab