mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 04:33:13 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jun Pataleta 2017-10-11 11:07:14 +08:00
commit 8c0f6e5419
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
calendar/classes/local/event/mappers/create_update_form_mapper.php
View File

@ -88,20 +88,7 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
public function from_data_to_event_properties(\stdClass $data) {
$properties = clone($data);
// Undo the form definition work around to allow us to have two different
// course selectors present depending on which event type the user selects.
if ($data->eventtype == 'course') {
// Default course id if none is set.
if (!isset($properties->courseid)) {
if ($properties->eventtype === 'site') {
$properties->courseid = SITEID;
} else {
$properties->courseid = 0;
}
} else {
$properties->courseid = $data->courseid;
}
} else if ($data->eventtype == 'group') {
if ($data->eventtype == 'group') {
if (isset($data->groupcourseid)) {
$properties->courseid = $data->groupcourseid;
unset($properties->groupcourseid);
@ -113,6 +100,17 @@ class create_update_form_mapper implements create_update_form_mapper_interface {
list($courseid, $groupid) = explode('-', $data->groupid);
$properties->groupid = $groupid;
}
} else {
// Default course id if none is set.
if (empty($properties->courseid)) {
if ($properties->eventtype == 'site') {
$properties->courseid = SITEID;
} else {
$properties->courseid = 0;
}
} else {
$properties->courseid = $data->courseid;
}
}
// Decode the form fields back into valid event property.