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

MDL-85652 block_site_main_menu: correct page context retrieval.

Browse Source 
Ensure we retrieve the context for the current page, rather than
the context in which the block was originally added (to account
for it being on site homepage, and being displayed throughout the
entire site).
This commit is contained in:
Paul Holden
2025-07-07 17:04:15 +01:00
parent a6b17d8f6b
commit 0d086be0d0
2 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/site_main_menu/block_site_main_menu.php
+10 -11
View File
@@ -104,22 +104,21 @@ class block_site_main_menu extends block_base {
if (!empty($this->page)) {
$course = $this->page->course;
$context = $this->page->context;
}
if (empty($course)) {
$course = $COURSE;
$context = \core\context\course::instance($course->id);
}
if ($this->context) {
$context = $this->context->get_parent_context();
if ($context->contextlevel == CONTEXT_COURSE) {
$courseid = $context->instanceid;
} else if ($context->contextlevel == CONTEXT_SYSTEM) {
$courseid = SITEID;
} else {
$coursecontext = $context->get_course_context(false);
if ($coursecontext) {
$courseid = $coursecontext->instanceid;
}
if ($context->contextlevel == CONTEXT_COURSE) {
$courseid = $context->instanceid;
} else if ($context->contextlevel == CONTEXT_SYSTEM) {
$courseid = SITEID;
} else {
$coursecontext = $context->get_course_context(false);
if ($coursecontext) {
$courseid = $coursecontext->instanceid;
}
}
blocks/site_main_menu/tests/behat/add_url.feature
+12 -15
View File
@@ -34,7 +34,7 @@ Feature: Add URL to Additional activities block
And "Add an activity or resource" "button" should exist in the "Additional activities" "block"
@javascript
Scenario: Add a URL in Additional activities block can appear in the entire site
Scenario: Add a URL in Additional activities block can appear in any site page
When I log in as "admin"
And I am on site homepage
And I turn editing mode on
@@ -57,7 +57,7 @@ Feature: Add URL to Additional activities block
Then I click on "reference link" "link" in the "Additional activities" "block"
And "reference link" "link" should exist in the "Additional activities" "block"
And I am on the "C1" "Course" page
And "reference link" "link" should exist in the "Additional activities" "block"
And "reference link" "link" should not exist in the "Additional activities" "block"
And I navigate to "Badges > Add a new badge" in site administration
And "reference link" "link" should exist in the "Additional activities" "block"
@@ -99,18 +99,15 @@ Feature: Add URL to Additional activities block
And I set the following fields to these values:
| Page contexts | Display throughout the entire site |
And I press "Save changes"
When the following "activity" exists:
| activity | url |
| course | C2 |
| name | reference link |
| intro | mooooooooodle |
| externalurl | http://www.moodle.com |
| section | 0 |
| showdescription | 1 |
And I am on the "reference link" "url activity editing" page
And I expand all fieldsets
When I am on the "C2" "Course" page
And I click on "Add content" "button" in the "Additional activities" "block"
And I click on "Activity or resource" "button" in the ".dropdown-menu.show" "css_element"
And I click on "Add a new URL" "link" in the "Add an activity or resource" "dialogue"
And I set the following fields to these values:
| id_display | In pop-up |
| name | reference link |
| externalurl | http://www.moodle.com |
And I press "Save and return to course"
Then "reference link" "link" should not exist in the "Additional activities" "block"
And I should see "mooooooooodle" in the "region-main" "region"
Then "reference link" "link" should exist in the "Additional activities" "block"
And I should see "reference link" in the "region-main" "region"
And I am on site homepage
And "reference link" "link" should not exist in the "Additional activities" "block"