MDL-77766 qtype_multichoice: Respect showstandardinstruction

* When showstandardinstruction is set to no, replace the standard instruction with the generic "Answer" text for the answer options fieldset's legend.
moodle · Apr 24, 2023 · bd8df1a · bd8df1a
1 parent 2caed29
commit bd8df1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/question/type/multichoice/renderer.php b/question/type/multichoice/renderer.php
@@ -149,11 +149,13 @@ public function formulation_and_controls(question_attempt $qa,
         $result .= html_writer::tag('div', $question->format_questiontext($qa),
                 array('class' => 'qtext'));
 
-        $questionnumber = $options->add_question_identifier_to_label($this->prompt(), true, true);
         $result .= html_writer::start_tag('fieldset', array('class' => 'ablock no-overflow visual-scroll-x'));
-        $legendclass = 'sr-only';
         if ($question->showstandardinstruction == 1) {
             $legendclass = '';
+            $questionnumber = $options->add_question_identifier_to_label($this->prompt(), true, true);
+        } else {
+            $questionnumber = $options->add_question_identifier_to_label(get_string('answer'), true, true);
+            $legendclass = 'sr-only';
         }
         $legendattrs = [
             'class' => 'prompt h6 font-weight-normal ' . $legendclass,

diff --git a/question/type/multichoice/tests/walkthrough_test.php b/question/type/multichoice/tests/walkthrough_test.php
@@ -302,7 +302,7 @@ public function test_deferredfeedback_feedback_multichoice_multi_showstandarduns
         $this->render();
 
         // Check for 'Show standard instruction'.
-        $standardinstruction = \html_writer::tag('legend', get_string('selectmulti', 'qtype_multichoice'), [
+        $standardinstruction = \html_writer::tag('legend', get_string('answer'), [
             'class' => 'prompt h6 font-weight-normal sr-only'
         ]);
         $this->assertStringContainsString($standardinstruction, $this->currentoutput);