From 67192cd6d46963a3397a5c9de00ebc0e900408fa Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 31 Jul 2019 10:57:41 +0200
Subject: [PATCH] =?UTF-8?q?Kalender-Fix:=20Bei=20Neueintrag=20werden=20ge?=
=?UTF-8?q?=C3=A4nderte=20Zeiten=20nun=20zugelassen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entityfields/begin/valueProcess.js | 5 +++-
.../entityfields/end/valueProcess.js | 30 ++++++++++---------
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/entity/Appointment_entity/entityfields/begin/valueProcess.js b/entity/Appointment_entity/entityfields/begin/valueProcess.js
index 0ec0da52b2..f87cdc0356 100644
--- a/entity/Appointment_entity/entityfields/begin/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/begin/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.neon");
import("system.vars");
import("system.calendars");
@@ -10,6 +11,8 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
{
var event = JSON.parse(vars.getString("$param.Entry_param"));
- if(event[calendars.DTSTART])
+ if(vars.get("$this.value"))
+ result.string(vars.get("$this.value"));
+ else if(event[calendars.DTSTART])
result.string(event[calendars.DTSTART]);
}
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/end/valueProcess.js b/entity/Appointment_entity/entityfields/end/valueProcess.js
index 1276bc19ec..284d2d6651 100644
--- a/entity/Appointment_entity/entityfields/end/valueProcess.js
+++ b/entity/Appointment_entity/entityfields/end/valueProcess.js
@@ -1,15 +1,17 @@
-import("system.neon");
-import("system.vars");
-import("system.calendars");
-import("system.result");
-
-/**
- * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
- */
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
-{
- var event = JSON.parse(vars.getString("$param.Entry_param"));
-
- if(event[calendars.DTEND])
- result.string(event[calendars.DTEND]);
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(vars.get("$this.value"))
+ result.string(vars.get("$this.value"));
+ else if(event[calendars.DTEND])
+ result.string(event[calendars.DTEND]);
}
\ No newline at end of file
--
GitLab