mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-72555 block_site_main_menu: Fix activity chooser issue

Browse Source 
* When adding the block_site_main_menu on every page, the activity chooser generated
for this entire page is set with courseid = 1. So any activity is then added to the
home page instead of a course.
This commit is contained in:
Laurent David 2022-05-17 19:01:24 +02:00 committed by Laurent David
parent ca583bddaf
commit 34fc0fa049
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blocks/site_main_menu/block_site_main_menu.php
View File

@ -237,9 +237,10 @@ class block_site_main_menu extends block_list {
$this->content->icons[] = '';
}
$this->content->footer = $courserenderer->course_section_add_cm_control($course,
if ($this->page->course->id === SITEID) {
$this->content->footer = $courserenderer->course_section_add_cm_control($course,
0, null, array('inblock' => true));
}
return $this->content;
}
}

37
blocks/site_main_menu/tests/behat/add_url.feature
View File

@ -12,8 +12,8 @@ Feature: Add URL to main menu block
And I add the "Main menu" block
When I add a "URL" to section "0" and I fill the form with:
| Name | reference link |
| Description | gooooooooogle |
| External URL | http://www.google.com |
| Description | mooooooooodle |
| External URL | http://www.moodle.com |
| id_display | In pop-up |
Then "reference link" "link" should exist in the "Main menu" "block"
And "Add an activity or resource" "button" should exist in the "Main menu" "block"
@ -35,8 +35,8 @@ Feature: Add URL to main menu block
And I press "Save changes"
And I add a "URL" to section "0" and I fill the form with:
| Name | reference link |
| Description | gooooooooogle |
| External URL | http://www.google.com |
| Description | mooooooooodle |
| External URL | http://www.moodle.com |
| id_display | Embed |
Then I click on "reference link" "link" in the "Main menu" "block"
And "reference link" "link" should exist in the "Main menu" "block"
@ -62,8 +62,8 @@ Feature: Add URL to main menu block
And I press "Save changes"
And I add a "URL" to section "0" and I fill the form with:
| Name | reference link |
| Description | gooooooooogle |
| External URL | http://www.google.com |
| Description | mooooooooodle |
| External URL | http://www.moodle.com |
| id_display | Embed |
Then I click on "reference link" "link" in the "Main menu" "block"
And "reference link" "link" should exist in the "Main menu" "block"
@ -71,3 +71,28 @@ Feature: Add URL to main menu block
And "Main menu" "block" should not exist
And I navigate to "Badges > Add a new badge" in site administration
And "Main menu" "block" should not exist
@javascript
Scenario: When the "Main Menu" block is displayed throrought the entire site, adding an URL in a course
results in adding it in the course and not in the frontpage
Given the following "course" exists:
| fullname | Course 1 |
| shortname | C1 |
| category | 0 |
And I log in as "admin"
And I am on site homepage
And I turn editing mode on
And I add the "Main menu" block
And I configure the "Main menu" block
And I set the following fields to these values:
| Page contexts | Display throughout the entire site |
And I press "Save changes"
When I am on the "C1" Course page
And I add a "URL" to section "0" and I fill the form with:
| Name | reference link |
| Description | mooooooooodle |
| External URL | http://www.moodle.com |
| Display description on course page | 1 |
| id_display | In pop-up |
Then "reference link" "link" should not exist in the "Main menu" "block"
And I should see "mooooooooodle" in the "region-main" "region"