holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix calendar title not being set for scheduled calls and the contacts as participants not being counted

Browse Source
This commit is contained in:
Hadi Nategh 2021-05-17 09:33:42 +02:00
parent 765b95cd49
commit bea4b0dcf9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1123,11 +1123,13 @@ class calendar_boupdate extends calendar_bo
true); true);
$details['videoconference'] = EGroupware\Status\Videoconference\Call::genMeetingUrl($event['##videoconference'], [ $details['videoconference'] = EGroupware\Status\Videoconference\Call::genMeetingUrl($event['##videoconference'], [
'title' => $event['title'],
'name' => $fullname, 'name' => $fullname,
'email' => is_numeric($userid) ? Api\Accounts::id2name($userid, 'account_email') : $userid, 'email' => is_numeric($userid) ? Api\Accounts::id2name($userid, 'account_email') : $userid,
'avatar' => (string)$avatar, 'avatar' => (string)$avatar,
'account_id' => $userid, 'account_id' => $userid,
'cal_id' => $details['id'] 'cal_id' => $details['id'],
'notify_only' => true
], ['participants' =>array_filter($event['participants'], function($key){return is_numeric($key);}, ARRAY_FILTER_USE_KEY)], $startdate, $enddate); ], ['participants' =>array_filter($event['participants'], function($key){return is_numeric($key);}, ARRAY_FILTER_USE_KEY)], $startdate, $enddate);
$event_arr['videoconference'] = [ $event_arr['videoconference'] = [
'field' => lang('Video Conference'), 'field' => lang('Video Conference'),

2
calendar/js/app.js
View File

@ -3688,7 +3688,7 @@ var CalendarApp = /** @class */ (function (_super) {
// Send just the timestamp (as a string) with no timezone // Send just the timestamp (as a string) with no timezone
(typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0, -1), (typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0, -1),
(typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0, -1), { (typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0, -1), {
participants: Object.keys(_data.participants).filter(function (v) { return v.match(/^[0-9]|[e]/); }) participants: Object.keys(_data.participants).filter(function (v) { return v.match(/^[0-9|e|c]/); })
}], function (_value) { }], function (_value) {
if (_value) { if (_value) {
if (_value.err) if (_value.err)

2
calendar/js/app.ts
View File

@ -4577,7 +4577,7 @@ class CalendarApp extends EgwApp
( typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0,-1), ( typeof _data.start != "string" ? _data.start.toJSON() : _data.start).slice(0,-1),
( typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0,-1), ( typeof _data.end != "string" ? _data.end.toJSON() : _data.end).slice(0,-1),
{ {
participants:Object.keys(_data.participants).filter(v => {return v.match(/^[0-9]|[e]/)}) participants:Object.keys(_data.participants).filter(v => {return v.match(/^[0-9|e|c]/)})
}], function(_value){ }], function(_value){
if (_value) if (_value)
{ {