forked from extern/egroupware
Add videoconference link to event notification email
This commit is contained in:
parent
158e65fc90
commit
1af9a9b13f
@ -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
|
||||
{
|
||||
|
@ -3610,7 +3610,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();
|
||||
};
|
||||
|
@ -4478,7 +4478,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();
|
||||
}
|
||||
|
@ -57,11 +57,15 @@
|
||||
</row>
|
||||
<row class="row">
|
||||
<description value="Location"/>
|
||||
<description id="location" no_lang="1"/>
|
||||
<hbox>
|
||||
<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 class="row">
|
||||
<description value="Date"/>
|
||||
<hbox options="0,0">
|
||||
<hbox>
|
||||
<date-time id="start" readonly="true"/>
|
||||
<date-time label="-" id="end" readonly="true" class="leftPad5"/>
|
||||
</hbox>
|
||||
|
Loading…
Reference in New Issue
Block a user