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

MDL-28735 calendar: Fixing issues with course selection dropdown

Browse source
This commit is contained in:
Ankit Agarwal 2012-04-23 14:58:39 +08:00
parent 93fb7b528b
commit 958f4ff45f
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
calendar/renderer.php
View file

@ -135,7 +135,9 @@ class core_calendar_renderer extends plugin_renderer_base {
* @return string * @return string
*/ */
public function fake_block_filters($courseid, $day, $month, $year, $view, $courses) { public function fake_block_filters($courseid, $day, $month, $year, $view, $courses) {
return html_writer::tag('div', calendar_filter_controls($this->page->url), array('class'=>'calendar_filters filters')); $returnurl = $this->page->url;
$returnurl->param('course', $courseid);
return html_writer::tag('div', calendar_filter_controls($returnurl), array('class'=>'calendar_filters filters'));
} }
/** /**

9
calendar/set.php
View file

@ -45,8 +45,13 @@ require_sesskey();
$var = required_param('var', PARAM_ALPHA); $var = required_param('var', PARAM_ALPHA);
$return = clean_param(base64_decode(required_param('return', PARAM_RAW)), PARAM_URL); $return = clean_param(base64_decode(required_param('return', PARAM_RAW)), PARAM_URL);
$courseid = optional_param('id', -1, PARAM_INT);
$url = new moodle_url('/calendar/set.php', array('return'=>base64_encode($return),'var'=>$var, 'sesskey'=>sesskey())); if ($courseid != -1) {
$return = new moodle_url($return, array('course' => $courseid));
} else {
$return = new moodle_url($return);
}
$url = new moodle_url('/calendar/set.php', array('return'=>base64_encode($return->out(false)), 'course' => $courseid, 'var'=>$var, 'sesskey'=>sesskey()));
$PAGE->set_url($url); $PAGE->set_url($url);
$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM)); $PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));

2
calendar/view.php
View file

@ -127,7 +127,7 @@ switch($view) {
echo $renderer->show_day($calendar); echo $renderer->show_day($calendar);
break; break;
case 'month': case 'month':
echo $renderer->show_month_detailed($calendar); echo $renderer->show_month_detailed($calendar, $url);
break; break;
case 'upcoming': case 'upcoming':
$defaultlookahead = CALENDAR_DEFAULT_UPCOMING_LOOKAHEAD; $defaultlookahead = CALENDAR_DEFAULT_UPCOMING_LOOKAHEAD;