Permalink
Browse files

Merge branch 'MDL-63119-34' of git://github.com/lameze/moodle into MO…

…ODLE_34_STABLE
  • Loading branch information...
dmonllao committed Sep 25, 2018
2 parents 816f9a5 + 0cd1bc0 commit 61859ec6808a40c7233c8c62bcf890025e12d07d
Showing with 5 additions and 1 deletion.
  1. +4 −0 calendar/classes/external/event_exporter.php
  2. +1 −1 calendar/templates/event_summary_body.mustache
@@ -92,6 +92,10 @@ protected function get_other_values(renderer_base $output) {
}
$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,
@@ -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>

0 comments on commit 61859ec

Please sign in to comment.