Skip to content
Snippets Groups Projects
Commit c0939496 authored by Alexander Bias's avatar Alexander Bias
Browse files

Fix missing data in second row when corresponding filters are not activated

parent ae140573
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,7 @@ This plugin requires Moodle 3.0+
Changes
-------
* 2016-03-02 - Fix missing data in second row when corresponding filters are not activated; Credits to Dimitri Vorona
* 2016-02-10 - Change plugin version and release scheme to the scheme promoted by moodle.org, no functionality change
* 2016-01-01 - Add support for Shifter in YUI files, fix several JSLint errors
* 2016-01-01 - Check compatibility for Moodle 3.0, no functionality change
......
......@@ -229,9 +229,9 @@ class block_course_overview_campus extends block_base {
// Get course context
$context = context_course::instance($c->id);
// Populate filters with data about my courses
// Term filter
if ($coc_config->termcoursefilter == true) {
// Collect information about my courses and populate filters with data about my courses
// Term information
if ($coc_config->termcoursefilter == true || $coc_config->secondrowshowtermname == true) {
// Create object for bufferung course term information
$courseterm = new stdClass();
......@@ -399,23 +399,24 @@ class block_course_overview_campus extends block_base {
// Remember course term for later use
$c->term = $courseterm->id;
$c->termname = format_string($courseterm->name);
}
// Term filter
if ($coc_config->termcoursefilter == true) {
// Add course term to filter list
$filterterms[$courseterm->id] = $courseterm->name;
// Cleanup
unset ($courseterm);
}
// Category filter
if ($coc_config->categorycoursefilter == true) {
// Category information
if ($coc_config->categorycoursefilter == true || $coc_config->secondrowshowcategoryname == true) {
// Get course category name from array of all category names
$coursecategory = $coursecategories[$c->category];
// Remember course category name for later use
$c->categoryname = format_string($coursecategory->name);
$c->categoryid = $coursecategory->id;
}
// Category filter
if ($coc_config->categorycoursefilter == true) {
// Merge homonymous categories into one category if configured
if ($coc_config->mergehomonymouscategories == true) {
// Check if course category name is already present in the category filter array
......@@ -431,7 +432,7 @@ class block_course_overview_campus extends block_base {
$filtercategories[$c->categoryid] = $c->categoryname;
}
// Teacher filter
// Teacher information
if ($coc_config->teachercoursefilter == true || $coc_config->secondrowshowteachername == true) {
// Get course teachers based on global teacher roles
if (count($teacherroles) > 0) {
......@@ -459,7 +460,9 @@ class block_course_overview_campus extends block_base {
// Remember course teachers for later use
$c->teachers = $courseteachers;
}
// Teacher filter
if ($coc_config->teachercoursefilter == true) {
// Add all course teacher's names to filter list
if ($coc_config->teachercoursefilter == true) {
foreach ($courseteachers as $ct) {
......
......@@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die();
$plugin->component = 'block_course_overview_campus';
$plugin->version = 2016021000;
$plugin->version = 2016030200;
$plugin->release = 'v3.0-r2';
$plugin->requires = 2015111600;
$plugin->maturity = MATURITY_STABLE;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment