Merge branch 'MDL-59674-master' of git://github.com/lameze/moodle

calendar/classes/external/event_exporter.php

@@ -71,6 +71,12 @@ class event_exporter extends event_exporter_base {
             'type' => PARAM_URL,
             'optional' => true,
         ];
+        $values['groupname'] = [
+            'type' => PARAM_RAW,
+            'optional' => true,
+            'default' => null,
+            'null' => NULL_ALLOWED
+        ];
 
         return $values;
     }
@@ -146,6 +152,15 @@ class event_exporter extends event_exporter_base {
             }
         }
 
+        if ($legacyevent->groupid) {
+            if ($group = calendar_get_group_cached($legacyevent->groupid)) {
+                $values['groupname'] = format_string($group->name, true,
+                        ['context' => \context_course::instance($group->courseid)]);
+            } else {
+                $values['groupname'] = null;
+            }
+        }
+
         return $values;
     }
 }

calendar/templates/event_summary_body.mustache

@@ -23,7 +23,9 @@
     {
         "timestart": 1490320388,
         "description": "An random event description",
-        "eventtype": "open"
+        "eventtype": "User",
+        "source": "Ical imported",
+        "groupname": "Group 1"
     }
 }}
 <div data-region="summary-modal-container" data-event-id="{{id}}" data-event-title="{{name}}"
@@ -43,4 +45,7 @@
     {{#source}}
         <div>{{{source}}}</div>
     {{/source}}
+    {{#groupname}}
+        <div>{{{groupname}}}</div>
+    {{/groupname}}
 </div>