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

Merge branch 'MDL-74825-master' of https://github.com/rmady/moodle

Browse source
This commit is contained in:
Jun Pataleta 2022-07-18 16:47:13 +08:00
commit 1294048575
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/tool/mobile/classes/api.php
View file

@ -344,6 +344,10 @@ class api {
$settings->enabledashboard = $CFG->enabledashboard;
}
if (empty($section) || $section === 'themesettings') {
$settings->customusermenuitems = $CFG->customusermenuitems;
}
return $settings;
}

1
admin/tool/mobile/tests/externallib_test.php
View file

@ -234,6 +234,7 @@ class externallib_test extends externallib_advanced_testcase {
$expected[] = ['name' => 'coursegraceperiodbefore', 'value' => $CFG->coursegraceperiodbefore];
$expected[] = ['name' => 'enabledashboard', 'value' => $CFG->enabledashboard];
$expected[] = ['name' => 'customusermenuitems', 'value' => $CFG->customusermenuitems];
$this->assertCount(0, $result['warnings']);
$this->assertEquals($expected, $result['settings']);

4
admin/tool/mobile/upgrade.txt
View file

@ -1,6 +1,10 @@
This files describes changes in tool_mobile code.
Information provided here is intended especially for developers.
=== 4.1 ===
* External function tool_mobile::get_config now returns the customusermenuitems setting.
=== 4.0 ===
* The function tool_mobile\api::get_qrlogin_key() now requires as parameter an object with all the mobile plugin settings.