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

Add videoconference link to event notification email

Browse Source
This commit is contained in:
nathangray 2021-02-25 10:33:34 -07:00
parent 158e65fc90
commit 1af9a9b13f
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2196,6 +2196,10 @@ class calendar_uiforms extends calendar_ui
} }
} }
$event['id'] = $existing_event['id']; $event['id'] = $existing_event['id'];
if($existing_event['##videoconference'])
{
$event['##videoconference'] = $existing_event['##videoconference'];
}
} }
else // event not in calendar else // event not in calendar
{ {

2
calendar/js/app.js
View File

@ -3610,7 +3610,7 @@ var CalendarApp = /** @class */ (function (_super) {
if (_value.err) if (_value.err)
egw.message(_value.err, 'error'); egw.message(_value.err, 'error');
if (_value.url) if (_value.url)
app.status.openCall(_value.url); egw.top.app.status.openCall(_value.url);
} }
}).sendRequest(); }).sendRequest();
}; };

2
calendar/js/app.ts
View File

@ -4478,7 +4478,7 @@ class CalendarApp extends EgwApp
if (_value) if (_value)
{ {
if (_value.err) egw.message(_value.err, 'error'); 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(); }).sendRequest();
} }

6
calendar/templates/default/meeting.xet
View File

@ -57,11 +57,15 @@
</row> </row>
<row class="row"> <row class="row">
<description value="Location"/> <description value="Location"/>
<hbox>
<description id="location" no_lang="1"/> <description id="location" no_lang="1"/>
<description class="et2_link" value="Videoconference" disabled="!@##videoconference" onclick="app.calendar.joinVideoConference(widget.getArrayMgr('content').getEntry('##videoconference'), widget.getArrayMgr('content').data);"/>
<image src="videoconference" disabled="!@##videoconference"/>
</hbox>
</row> </row>
<row class="row"> <row class="row">
<description value="Date"/> <description value="Date"/>
<hbox options="0,0"> <hbox>
<date-time id="start" readonly="true"/> <date-time id="start" readonly="true"/>
<date-time label="-" id="end" readonly="true" class="leftPad5"/> <date-time label="-" id="end" readonly="true" class="leftPad5"/>
</hbox> </hbox>