moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-72250-master-3' of https://github.com/bmbrands/moodle

Browse source
This commit is contained in:
Shamim Rezaie 2021-11-17 07:30:54 +11:00
commit dfe03b3036
14 changed files with 210 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/classes/navigation/output/primary.php
View file

@ -57,10 +57,12 @@ class primary implements renderable, templatable {
$menudata = (object) array_merge($this->get_primary_nav(), $this->get_custom_menu($output));
$moremenu = new \core\navigation\output\more_menu($menudata, 'navbar-nav', false);
$mobileprimarynav = array_merge($this->get_primary_nav(), $this->get_custom_menu($output));
$languagemenu = new \core\output\language_menu($this->page);
return [
'mobileprimarynav' => $mobileprimarynav,
'moremenu' => $moremenu->export_for_template($output),
'lang' => !isloggedin() || isguestuser() ? $languagemenu->export_for_template($output) : [],
'user' => $this->get_user_menu($output),

18
lib/tests/navigation/output/primary_test.php
View file

@ -116,31 +116,31 @@ class primary_test extends \advanced_testcase {
public function test_primary_export_provider(): array {
return [
"Export the menu data when: custom menu exists; multiple langs installed; user is not logged in." => [
true, true, '', ['moremenu', 'lang', 'user']
true, true, '', ['mobileprimarynav', 'moremenu', 'lang', 'user']
],
"Export the menu data when: custom menu exists; langs not installed; user is not logged in." => [
true, false, '', ['moremenu', 'user']
true, false, '', ['mobileprimarynav', 'moremenu', 'user']
],
"Export the menu data when: custom menu exists; multiple langs installed; logged in as admin." => [
true, true, 'admin', ['moremenu', 'user']
true, true, 'admin', ['mobileprimarynav', 'moremenu', 'user']
],
"Export the menu data when: custom menu exists; langs not installed; logged in as admin." => [
true, false, 'admin', ['moremenu', 'user']
true, false, 'admin', ['mobileprimarynav', 'moremenu', 'user']
],
"Export the menu data when: custom menu exists; multiple langs installed; logged in as guest." => [
true, true, 'guest', ['moremenu', 'lang', 'user']
true, true, 'guest', ['mobileprimarynav', 'moremenu', 'lang', 'user']
],
"Export the menu data when: custom menu exists; langs not installed; logged in as guest." => [
true, false, 'guest', ['moremenu', 'user']
true, false, 'guest', ['mobileprimarynav', 'moremenu', 'user']
],
"Export the menu data when: custom menu does not exist; multiple langs installed; logged in as guest." => [
false, true, 'guest', ['moremenu', 'lang', 'user']
false, true, 'guest', ['mobileprimarynav', 'moremenu', 'lang', 'user']
],
"Export the menu data when: custom menu does not exist; multiple langs installed; logged in as admin." => [
false, true, 'admin', ['moremenu', 'user']
false, true, 'admin', ['mobileprimarynav', 'moremenu', 'user']
],
"Export the menu data when: custom menu does not exist; langs not installed; user is not logged in." => [
false, false, '', ['moremenu', 'user']
false, false, '', ['mobileprimarynav', 'moremenu', 'user']
],
];
}