MDL-62992 question: conditionaly enable question tags feature

moodle · Mar 27, 2019 · 89b9e4f · 89b9e4f
1 parent d70651f
commit 89b9e4f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/question/classes/bank/view.php b/question/classes/bank/view.php
@@ -462,7 +462,7 @@ public function preview_question_url($questiondata) {
      */
     public function display($tabname, $page, $perpage, $cat,
             $recurse, $showhidden, $showquestiontext, $tagids = []) {
-        global $PAGE;
+        global $PAGE, $CFG;
 
         if ($this->process_actions_needing_ui()) {
             return;
@@ -473,7 +473,14 @@ public function display($tabname, $page, $perpage, $cat,
         $thiscontext = $this->get_most_specific_context();
         // Category selection form.
         $this->display_question_bank_header();
-        array_unshift($this->searchconditions, new \core_question\bank\search\tag_condition([$catcontext, $thiscontext], $tagids));
+
+        // Display tag filter if usetags setting is enabled.
+        if ($CFG->usetags) {
+            array_unshift($this->searchconditions,
+                    new \core_question\bank\search\tag_condition([$catcontext, $thiscontext], $tagids));
+            $PAGE->requires->js_call_amd('core_question/edit_tags', 'init', ['#questionscontainer']);
+        }
+
         array_unshift($this->searchconditions, new \core_question\bank\search\hidden_condition(!$showhidden));
         array_unshift($this->searchconditions, new \core_question\bank\search\category_condition(
                 $cat, $recurse, $editcontexts, $this->baseurl, $this->course));
@@ -485,7 +492,6 @@ public function display($tabname, $page, $perpage, $cat,
                 null, $page, $perpage, $showhidden, $showquestiontext,
                 $this->contexts->having_cap('moodle/question:add'));
 
-        $PAGE->requires->js_call_amd('core_question/edit_tags', 'init', ['#questionscontainer']);
     }
 
     protected function print_choose_category_message($categoryandcontext) {