Merge branch 'MDL-74436' of https://github.com/paulholden/moodle

moodle · May 2, 2022 · f9a3ccb · f9a3ccb
2 parents 1a74403 + 2255c59
commit f9a3ccb
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/calendar/classes/local/event/forms/managesubscriptions.php b/calendar/classes/local/event/forms/managesubscriptions.php
@@ -140,6 +140,13 @@ public function validation($data, $files) {
             $errors['url'] = get_string('errorrequiredurlorfile', 'calendar');
         }
 
+        // Validate course/category event types (ensure appropriate field is also filled in).
+        if ($eventtype === 'course' && empty($data['courseid'])) {
+            $errors['courseid'] = get_string('selectacourse');
+        } else if ($eventtype === 'category' && empty($data['categoryid'])) {
+            $errors['categoryid'] = get_string('required');
+        }
+
         return $errors;
     }