MDL-72706 core_course: Change default value of Hidden sections setting

moodle · Oct 15, 2021 · 1b1735f · 1b1735f
1 parent 9145d80
commit 1b1735f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/admin/settings/courses.php b/admin/settings/courses.php
@@ -109,7 +109,7 @@
     $choices['0'] = new lang_string('hiddensectionscollapsed');
     $choices['1'] = new lang_string('hiddensectionsinvisible');
     $temp->add(new admin_setting_configselect('moodlecourse/hiddensections', new lang_string('hiddensections'),
-        new lang_string('coursehelphiddensections'), 0, $choices));
+        new lang_string('coursehelphiddensections'), 1, $choices));
 
     $choices = array();
     $choices[COURSE_DISPLAY_SINGLEPAGE] = new lang_string('coursedisplay_single');

diff --git a/course/format/classes/output/local/content/section/availability.php b/course/format/classes/output/local/content/section/availability.php
@@ -106,7 +106,7 @@ protected function get_info(\renderer_base $output): array {
             if ($canviewhidden) {
                 $info[] = $this->availability_info(get_string('hiddenfromstudents'), 'ishidden');
             } else {
-                // We are here because of the setting "Hidden sections are shown in collapsed form".
+                // We are here because of the setting "Hidden sections are shown as not available".
                 // Student can not see the section contents but can see its name.
                 $info[] = $this->availability_info(get_string('notavailable'), 'ishidden');
             }

diff --git a/course/format/classes/output/section_renderer.php b/course/format/classes/output/section_renderer.php
@@ -374,7 +374,7 @@ protected function section_header($section, $course, $onsectionpage, $sectionret
         if ($section->uservisible || $section->visible) {
             // Show summary if section is available or has availability restriction information.
             // Do not show summary if section is hidden but we still display it because of course setting
-            // "Hidden sections are shown in collapsed form".
+            // "Hidden sections are shown as not available".
             $o .= $this->format_summary_text($section);
         }
         $o .= html_writer::end_tag('div');
@@ -503,7 +503,7 @@ protected function section_summary($section, $course, $mods) {
         if ($section->uservisible || $section->visible) {
             // Show summary if section is available or has availability restriction information.
             // Do not show summary if section is hidden but we still display it because of course setting
-            // "Hidden sections are shown in collapsed form".
+            // "Hidden sections are shown as not available".
             $o .= $this->format_summary_text($section);
         }
         $o .= html_writer::end_tag('div');

diff --git a/course/tests/behat/course_collapse_sections.feature b/course/tests/behat/course_collapse_sections.feature
@@ -17,6 +17,7 @@ Feature: Collapse course sections
       | numsections      | 5         |
       | startdate        | 957139200 |
       | enablecompletion | 1         |
+      | hiddensections   | 0         |
     And the following "activities" exist:
       | activity | name         | intro                        | course | idnumber | section | completion |
       | assign   | Assignment 1 | Test assignment description1 | C1     | assign1  | 1       | 1          |

diff --git a/course/tests/behat/section_visibility.feature b/course/tests/behat/section_visibility.feature
@@ -10,8 +10,8 @@ Feature: Show/hide course sections
       | teacher1 | Teacher | 1 | teacher1@example.com |
       | student1 | Student | 1 | student1@example.com |
     And the following "courses" exist:
-      | fullname | shortname | format |
-      | Course 1 | C1 | topics |
+      | fullname | shortname | format | hiddensections |
+      | Course 1 | C1 | topics | 0                     |
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |

diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php
@@ -2651,7 +2651,7 @@ public function test_get_courses_by_field() {
         $this->assertCount(2, $result['courses'][0]['courseformatoptions']);
         foreach ($result['courses'][0]['courseformatoptions'] as $option) {
             if ($option['name'] == 'hiddensections') {
-                $this->assertEquals(0, $option['value']);
+                $this->assertEquals(1, $option['value']);
             } else {
                 $this->assertEquals('coursedisplay', $option['name']);
                 $this->assertEquals(0, $option['value']);

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -990,8 +990,8 @@
 $string['hiddenfromstudents'] = 'Hidden from students';
 $string['hiddenoncoursepage'] = 'Available but not shown on course page';
 $string['hiddensections'] = 'Hidden sections';
-$string['hiddensections_help'] = 'This setting determines whether hidden sections are displayed to students in collapsed form (perhaps for a course in weekly format to indicate holidays) or are completely hidden.';
-$string['hiddensectionscollapsed'] = 'Hidden sections are shown in collapsed form';
+$string['hiddensections_help'] = 'Whether hidden sections are displayed to students as not available (perhaps for a course in weekly format to indicate holidays) or are completely hidden.';
+$string['hiddensectionscollapsed'] = 'Hidden sections are shown as not available';
 $string['hiddensectionsinvisible'] = 'Hidden sections are completely invisible';
 $string['hiddenwithbrackets'] = '(hidden)';
 $string['hide'] = 'Hide';