moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 19:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-63119-35' of git://github.com/lameze/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
David Monllao 2018-09-25 12:36:29 +02:00
commit 713385769d
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
calendar/classes/external/event_exporter.php vendored
View file

@ -92,6 +92,10 @@ class event_exporter extends event_exporter_base {
}
$values['url'] = $url->out(false);
// Override default formatted time to make sure the date portion of the time is always rendered.
$legacyevent = container::get_event_mapper()->from_event_to_legacy_event($event);
$values['formattedtime'] = calendar_format_event_time($legacyevent, time(), null, false);
if ($event instanceof action_event_interface) {
$actionrelated = [
'context' => $context,

2
calendar/templates/event_summary_body.mustache
View file

@ -41,7 +41,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-xs-1">{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}</div>
<div class="col-xs-11">{{#userdate}} {{timestart}}, {{#str}} strftimerecentfull {{/str}} {{/userdate}}</div>
<div class="col-xs-11">{{{formattedtime}}}</div>
</div>
<div class="row m-t-1">
<div class="col-xs-1">{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}</div>