diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 81ee2f187d..2ff5f715b1 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -2196,6 +2196,10 @@ class calendar_uiforms extends calendar_ui
}
}
$event['id'] = $existing_event['id'];
+ if($existing_event['##videoconference'])
+ {
+ $event['##videoconference'] = $existing_event['##videoconference'];
+ }
}
else // event not in calendar
{
diff --git a/calendar/js/app.js b/calendar/js/app.js
index 156127a5f1..6c6c19b53b 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3591,7 +3591,7 @@ var CalendarApp = /** @class */ (function (_super) {
if (_value.err)
egw.message(_value.err, 'error');
if (_value.url)
- app.status.openCall(_value.url);
+ egw.top.app.status.openCall(_value.url);
}
}).sendRequest();
};
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index b6643b77a1..b52d3db9ef 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4455,7 +4455,7 @@ class CalendarApp extends EgwApp
if (_value)
{
if (_value.err) egw.message(_value.err, 'error');
- if(_value.url) app.status.openCall(_value.url);
+ if(_value.url) egw.top.app.status.openCall(_value.url);
}
}).sendRequest();
}
diff --git a/calendar/templates/default/meeting.xet b/calendar/templates/default/meeting.xet
index 5d91852ec3..8d3bacb01b 100644
--- a/calendar/templates/default/meeting.xet
+++ b/calendar/templates/default/meeting.xet
@@ -57,11 +57,15 @@
-
+
+
+
+
+
-
+