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

Merging patch for improved calendar block behavior from MOODLE_14_STABLE.

Browse source
This commit is contained in:
defacer 2004-09-07 10:31:18 +00:00
parent f971d5021e
commit de79ec4550
2 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
blocks/calendar_month/block_calendar_month.php
View file

@ -24,11 +24,23 @@ class CourseBlock_calendar_month extends MoodleBlock {
$this->content->footer = ''; $this->content->footer = '';
if (empty($this->course)) { // Overrides: use no course at all if (empty($this->course)) { // Overrides: use no course at all
$courseshown = false; $courseshown = false;
$filtercourse = array(); $filtercourse = array();
} else { } else {
$courseshown = $this->course->id; $courseshown = $this->course->id;
$filtercourse = array($courseshown => 1);
if($this->course->id == SITEID) {
// Being displayed at site level. This will cause the filter to fall back to auto-detecting
// the list of courses it will be grabbing events from.
$filtercourse = NULL;
}
else {
// Forcibly filter events to include only those from the particular course we are in.
$filtercourse = array($courseshown => 1);
}
} }
// We 'll need this later // We 'll need this later

16
blocks/calendar_upcoming/block_calendar_upcoming.php
View file

@ -22,19 +22,31 @@ class CourseBlock_calendar_upcoming extends MoodleBlock {
$this->content = New object; $this->content = New object;
$this->content->text = ''; $this->content->text = '';
if (empty($this->course)) { // Overrides: use no course at all if (empty($this->course)) { // Overrides: use no course at all
$courseshown = false; $courseshown = false;
$filtercourse = array(); $filtercourse = array();
$this->content->footer = ''; $this->content->footer = '';
} else { } else {
$courseshown = $this->course->id; $courseshown = $this->course->id;
$filtercourse = array($courseshown => 1);
$this->content->footer = '<br /><a href="'.$CFG->wwwroot. $this->content->footer = '<br /><a href="'.$CFG->wwwroot.
'/calendar/view.php?view=upcoming&amp;course='.$this->course->id.'">'. '/calendar/view.php?view=upcoming&amp;course='.$this->course->id.'">'.
get_string('gotocalendar', 'calendar').'</a>...'; get_string('gotocalendar', 'calendar').'</a>...';
$this->content->footer .= '<br /><a href="'.$CFG->wwwroot. $this->content->footer .= '<br /><a href="'.$CFG->wwwroot.
'/calendar/event.php?action=new&amp;course='.$this->course->id.'">'. '/calendar/event.php?action=new&amp;course='.$this->course->id.'">'.
get_string('newevent', 'calendar').'</a>...'; get_string('newevent', 'calendar').'</a>...';
if($this->course->id == SITEID) {
// Being displayed at site level. This will cause the filter to fall back to auto-detecting
// the list of courses it will be grabbing events from.
$filtercourse = NULL;
}
else {
// Forcibly filter events to include only those from the particular course we are in.
$filtercourse = array($courseshown => 1);
}
} }
// We 'll need this later // We 'll need this later