L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-68715 completion: fix form default value for course prerequisites.

Browse Source 
Adds filtering on the completion criteria form to ensure we are only
selecting actual course instances of this type. Prior to this change
we would also get NULL values from unrelated criteria types.
This commit is contained in:
Paul Holden
2020-07-14 12:46:02 +01:00
parent ee23a8cf25
commit 8acaa4e356
4 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/completion_form.php
+4 -2
View File
@@ -128,14 +128,16 @@ class course_completion_form extends moodleform {
}
// Get applicable courses (prerequisites).
$selectedcourses = $DB->get_fieldset_sql("SELECT cc.courseinstance
FROM {course_completion_criteria} cc WHERE cc.course = ?", [$course->id]);
$hasselectablecourses = core_course_category::search_courses(['onlywithcompletion' => true], ['limit' => 2]);
unset($hasselectablecourses[$course->id]);
if ($hasselectablecourses) {
// Show multiselect box.
$mform->addElement('course', 'criteria_course', get_string('coursesavailable', 'completion'),
array('multiple' => 'multiple', 'onlywithcompletion' => true, 'exclude' => $course->id));
$mform->setType('criteria_course', PARAM_INT);
$selectedcourses = $DB->get_fieldset_select('course_completion_criteria', 'courseinstance',
'course = :course AND criteriatype = :type', ['course' => $course->id, 'type' => COMPLETION_CRITERIA_TYPE_COURSE]);
$mform->setDefault('criteria_course', $selectedcourses);
// Map aggregation methods to context-sensitive human readable dropdown menu.