diff --git a/Readme.md b/Readme.md index 923ada20..c88afb3e 100644 --- a/Readme.md +++ b/Readme.md @@ -243,6 +243,9 @@ can be really useful in visualising the issue along with any files you consider Version Information =================== +19th August 2014 Version 2.7.1.4 + 1. Fixed issue #11: Moodle notice - https://github.com/gjb2048/moodle-format_topcoll/issues/11. + 18th August 2014 Version 2.7.1.3 1. Fixed a few typos. 2. Fixed CONTRIB-5211: Section 5 does not remain expanded when browsing away and back. @@ -1117,6 +1120,6 @@ Desired Enhancements Me == -G J Barnard MSc. BSc(Hons)(Sndw). MBCS. CEng. CITP. PGCE. - 18th August 2014. +G J Barnard MSc. BSc(Hons)(Sndw). MBCS. CEng. CITP. PGCE. - 19th August 2014. Moodle profile: http://moodle.org/user/profile.php?id=442195. Web profile : http://about.me/gjbarnard diff --git a/renderer.php b/renderer.php index 87819aea..626e0892 100644 --- a/renderer.php +++ b/renderer.php @@ -570,7 +570,7 @@ public function print_multiple_section_page($course, $sections, $mods, $modnames while ($loopsection <= $course->numsections) { $nextweekdate = $weekdate - ($weekofseconds); if ((($thissection->uservisible || - ($thissection->visible && !$thissection->available && $thissection->showavailability)) + ($thissection->visible && !$thissection->available && !empty($thissection->availableinfo))) && ($nextweekdate <= $timenow)) == true) { $numsections++; // Section not shown so do not count in columns calculation. } @@ -676,13 +676,13 @@ public function print_multiple_section_page($course, $sections, $mods, $modnames $thissection = $modinfo->get_section_info($section); /* Show the section if the user is permitted to access it, OR if it's not available - but showavailability is turned on. */ + but there is some available info text which explains the reason & should display. */ if (($this->tcsettings['layoutstructure'] != 3) || ($this->userisediting)) { $showsection = $thissection->uservisible || - ($thissection->visible && !$thissection->available && $thissection->showavailability); + ($thissection->visible && !$thissection->available && !empty($thissection->availableinfo)); } else { $showsection = ($thissection->uservisible || - ($thissection->visible && !$thissection->available && $thissection->showavailability)) + ($thissection->visible && !$thissection->available && !empty($thissection->availableinfo))) && ($nextweekdate <= $timenow); } if (($currentsectionfirst == true) && ($showsection == true)) { @@ -692,7 +692,7 @@ public function print_multiple_section_page($course, $sections, $mods, $modnames $showsection = false; // Do not reshow current section. } if (!$showsection) { - // Hidden section message is overridden by 'unavailable' control (showavailability option). + // Hidden section message is overridden by 'unavailable' control. if ($this->tcsettings['layoutstructure'] != 4) { if (($this->tcsettings['layoutstructure'] != 3) || ($this->userisediting)) { if (!$course->hiddensections && $thissection->available) { diff --git a/version.php b/version.php index 2339cd05..ac3d432a 100644 --- a/version.php +++ b/version.php @@ -34,8 +34,8 @@ */ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2014081800; +$plugin->version = 2014081900; $plugin->maturity = MATURITY_STABLE; $plugin->requires = 2014051200.00; // 2.7 (Build: 20140512). $plugin->component = 'format_topcoll'; -$plugin->release = '2.7.1.3'; +$plugin->release = '2.7.1.4';