moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sara Arjona 2020-07-14 14:31:44 +02:00
commit 22f4eab309
4 changed files with 46 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
course/completion_form.php
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.