mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-01 21:55:12 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2021-02-01 19:13:47 +01:00
commit cd4d387936
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/classes/local/event/forms/create.php
View File

@ -128,6 +128,7 @@ class create extends \moodleform {
$eventtype = isset($data['eventtype']) ? $data['eventtype'] : null;
$coursekey = ($eventtype == 'group') ? 'groupcourseid' : 'courseid';
$courseid = (!empty($data[$coursekey])) ? $data[$coursekey] : null;
$categoryid = (!empty($data['categoryid'])) ? $data['categoryid'] : null;
$eventtypes = $this->_customdata['eventtypes'];
if (empty($eventtype) || !isset($eventtypes[$eventtype]) || $eventtypes[$eventtype] == false) {
@ -148,6 +149,10 @@ class create extends \moodleform {
$errors['courseid'] = get_string('selectacourse');
}
if ($eventtype == 'category' && empty($categoryid)) {
$errors['categoryid'] = get_string('selectacategory');
}
if ($eventtype == 'group' && (!empty($courseid) && empty($data['groupid']))) {
$errors['groupcourseid'] = get_string('nogroups', 'core_group');
}

6
lib/db/upgrade.php
View File

@ -2387,5 +2387,11 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2021052500.42);
}
if ($oldversion < 2021052500.55) {
$DB->delete_records_select('event', "eventtype = 'category' AND categoryid = 0 AND userid <> 0");
upgrade_main_savepoint(true, 2021052500.55);
}
return true;
}

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2021052500.54; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2021052500.55; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '4.0dev (Build: 20210130)'; // Human-friendly version name