MLD-28567 calendar: improved course filter process

This commit is contained in:
Sam Hemelryk 2014-01-30 09:39:11 +13:00
parent 27ebbdd703
commit dc606a57a7

View file

@ -715,7 +715,8 @@ class core_calendar_renderer extends plugin_renderer_base {
/** /**
* Displays a course filter selector * Displays a course filter selector
* *
* @param array $getvars * @param moodle_url $returnurl The URL that the user should be taken too upon selecting a course.
* @param string $label The label to use for the course select.
* @return string * @return string
*/ */
protected function course_filter_selector(moodle_url $returnurl, $label=null) { protected function course_filter_selector(moodle_url $returnurl, $label=null) {
@ -745,7 +746,9 @@ class core_calendar_renderer extends plugin_renderer_base {
} else { } else {
$selected = ''; $selected = '';
} }
$select = new single_select(new moodle_url(CALENDAR_URL.'set.php', array('return' => base64_encode($returnurl->out(false)), 'var' => 'setcourse', 'sesskey'=>sesskey())), 'id', $courseoptions, $selected, null); $courseurl = new moodle_url($returnurl);
$courseurl->remove_params('course');
$select = new single_select($courseurl, 'course', $courseoptions, $selected, null);
$select->class = 'cal_courses_flt'; $select->class = 'cal_courses_flt';
if ($label !== null) { if ($label !== null) {
$select->set_label($label); $select->set_label($label);