L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-86621 core_question: remove incorrect navigation nodes.

Browse Source
This commit is contained in:
hieuvu
2025-10-13 15:34:21 +07:00
parent 0efd4011ad
commit af360dbf2e
3 changed files with 52 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/blocks/navigation/tests/behat/adminnistration_navigation.feature
+36
View File
@@ -0,0 +1,36 @@
@block @block_navigation
Feature: Test that admin can see related nodes in Administration block
In order to manage
As an admin
I need to be able to see related nodes in Administration block
Background:
Given the following "categories" exist:
| name | category | idnumber | visible |
| cat1 | 0 | cat1 | 1 |
And the following "courses" exist:
| fullname | shortname | category | visible |
| Course 1 | c1 | cat1 | 1 |
And the following config values are set as admin:
| unaddableblocks | | theme_boost |
And I log in as "admin"
And I am on site homepage
And I turn editing mode on
And I add the "Administration" block if not present
And I configure the "Administration" block
And I set the following fields to these values:
| Page contexts | Display throughout the entire site |
And I press "Save changes"
@javascript
Scenario: As admin I must not see question related nodes in Administration.
Given the following "activities" exist:
| activity | name | intro | course | idnumber |
| quiz | Quiz 1 | Quiz 1 for testing the Add menu | c1 | quiz1 |
And I am on "Course 1" course homepage
Then I should see "Question bank"
And I should not see "Questions"
And I am on the "Quiz 1" "mod_quiz > view" page
And "Question bank" "link" should exist
And "Questions" "link" should exist
And "Categories" "link" should exist
public/lib/classes/navigation/settings_navigation.php
+2 -2
View File
@@ -596,7 +596,7 @@ class settings_navigation extends navigation_node {
// Questions.
require_once($CFG->libdir . '/questionlib.php');
$baseurl = \core_question\local\bank\question_bank_helper::get_url_for_qbank_list($course->id);
question_extend_settings_navigation($coursenode, $coursecontext, $baseurl)->trim_if_empty();
question_extend_settings_navigation($coursenode, $coursecontext, $baseurl);
if ($adminoptions->update) {
// Repository Instances.
@@ -1834,7 +1834,7 @@ class settings_navigation extends navigation_node {
// Questions.
require_once($CFG->libdir . '/questionlib.php');
$baseurl = \core_question\local\bank\question_bank_helper::get_url_for_qbank_list($course->id);
question_extend_settings_navigation($frontpage, $coursecontext, $baseurl)->trim_if_empty();
question_extend_settings_navigation($frontpage, $coursecontext, $baseurl);
// Manage files.
if ($adminoptions->files) {
public/lib/questionlib.php
+14 -3
View File
@@ -1417,7 +1417,13 @@ function question_extend_settings_navigation(navigation_node $navigationnode, $c
$iscourse = $context->contextlevel === CONTEXT_COURSE;
if ($iscourse) {
$params = ['courseid' => $context->instanceid];
return $navigationnode->add(
get_string('questionbank_plural', 'question'),
new moodle_url($baseurl, ['courseid' => $context->instanceid]),
navigation_node::TYPE_CONTAINER,
null,
'questionbank'
);
} else if ($context->contextlevel == CONTEXT_MODULE) {
$params = ['cmid' => $context->instanceid];
} else {
@@ -1428,8 +1434,13 @@ function question_extend_settings_navigation(navigation_node $navigationnode, $c
$params['cat'] = $cat;
}
$questionnode = $navigationnode->add(get_string($iscourse ? 'questionbank_plural' : 'questionbank', 'question'),
new moodle_url($baseurl, $params), navigation_node::TYPE_CONTAINER, null, 'questionbank');
$questionnode = $navigationnode->add(
get_string('questionbank', 'question'),
new moodle_url($baseurl, $params),
navigation_node::TYPE_CONTAINER,
null,
'questionbank'
);
$corenavigations = [
'questions' => [