Merge branch 'MDL-59383-fix-1' of https://github.com/lameze/moodle

calendar/amd/build/calendar.min.js

@@ -1 +1 @@
-define(["jquery","core/ajax","core/str","core/templates","core/notification","core/custom_interaction_events","core/modal_factory","core_calendar/summary_modal","core_calendar/calendar_repository"],function(a,b,c,d,e,f,g,h,i){var j={ROOT:"[data-region='calendar']",EVENT_LINK:"[data-action='view-event']"},k=null,l=function(a){var b="type"+a;return c.get_string(b,"core_calendar").then(function(a){return a}).fail(e.exception)},m=function(a){var b=i.getEventById(a);return b.then(function(a){return a.event?a.event:void b.fail(e.exception)}).then(function(a){return l(a.eventtype).then(function(b){return a.eventtype=b,a})}).then(function(a){return k.done(function(b){b.setTitle(a.name),b.setBody(d.render("core_calendar/event_summary_body",a)),0==a.caneditevent&&b.setFooter(""),b.show()})})},n=function(b){b=a(b);var c=!1;b.on("click",j.EVENT_LINK,function(b){if(!c){c=!0,b.preventDefault();var d=a(b.target).closest(j.EVENT_LINK),e=d.attr("data-event-id");m(e).done(function(){c=!1})}})};return{init:function(){k=g.create({type:h.TYPE}),n(j.ROOT)}}});
+define(["jquery","core/ajax","core/str","core/templates","core/notification","core/custom_interaction_events","core/modal_factory","core_calendar/summary_modal","core_calendar/calendar_repository"],function(a,b,c,d,e,f,g,h,i){var j={ROOT:"[data-region='calendar']",EVENT_LINK:"[data-action='view-event']"},k=null,l=function(a){var b="type"+a;return c.get_string(b,"core_calendar").then(function(a){return a}).fail(e.exception)},m=function(a){var b=i.getEventById(a);return b.then(function(a){return a.event?a.event:void b.fail(e.exception)}).then(function(a){return l(a.eventtype).then(function(b){return a.eventtype=b,a})}).then(function(a){return k.done(function(b){b.setTitle(a.name),d.render("core_calendar/event_summary_body",a).done(function(a,c){d.replaceNodeContents(b.getBody(),a,c)}),0==a.caneditevent&&b.setFooter(""),b.show()})})},n=function(b){b=a(b);var c=!1;b.on("click",j.EVENT_LINK,function(b){if(!c){c=!0,b.preventDefault();var d=a(b.target).closest(j.EVENT_LINK),e=d.attr("data-event-id");m(e).done(function(){c=!1})}})};return{init:function(){k=g.create({type:h.TYPE}),n(j.ROOT)}}});

calendar/amd/src/calendar.js

@@ -69,7 +69,13 @@ define(['jquery', 'core/ajax', 'core/str', 'core/templates', 'core/notification'
             }).then(function(eventdata) {
                 return modalPromise.done(function(modal) {
                     modal.setTitle(eventdata.name);
-                    modal.setBody(Templates.render('core_calendar/event_summary_body', eventdata));
+
+                    Templates.render(
+                        'core_calendar/event_summary_body',
+                        eventdata
+                    ).done(function(html, js) {
+                        Templates.replaceNodeContents(modal.getBody(), html, js);
+                    });
 
                     // Hide edit and delete buttons if I don't have permission.
                     if (eventdata.caneditevent == false) {

calendar/externallib.php

@@ -719,6 +719,7 @@ class core_calendar_external extends external_api {
         // We need to get events asked for eventids.
         $event = calendar_get_events_by_id([$eventid]);
         $eventobj = calendar_event::load($eventid);
+        list($event[$eventid]->description, $event[$eventid]->format) = $eventobj->format_external_text();
         $event[$eventid]->caneditevent = calendar_edit_event_allowed($eventobj);
 
         return array('event' => $event[$eventid], 'warnings' => $warnings);

calendar/templates/event_summary_body.mustache

@@ -26,7 +26,7 @@
         "eventtype": "open",
     }
 }}
-<div class="container">
+<div>
     <h4>{{#str}} when, core_calendar {{/str}}</h4>
     {{#userdate}} {{timestart}}, {{#str}} strftimerecentfull {{/str}} {{/userdate}}
     <br>

calendar/templates/event_summary_modal.mustache

@@ -26,7 +26,7 @@
 }}
 {{< core/modal }}
 {{$footer}}
-<button type="button" class="btn btn-secondary pull-xs-left" data-action="delete">{{#str}} delete {{/str}}</button>
+<button type="button" class="btn btn-secondary" data-action="delete">{{#str}} delete {{/str}}</button>
 <button type="button" class="btn btn-primary" data-action="edit">{{#str}} edit {{/str}}</button>
 {{/footer}}
 {{/ core/modal }}