Merge branch 'MDL-73394-master' of https://github.com/sarjona/moodle

moodle · Dec 30, 2021 · 2eaab7e · 2eaab7e
2 parents ef233d3 + bfa24ae
commit 2eaab7e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/admin/tool/admin_presets/classes/manager.php b/admin/tool/admin_presets/classes/manager.php
@@ -399,6 +399,11 @@ public function apply_preset(int $presetid, bool $simulate = false): array {
         $applied = array_merge($settingsapplied, $pluginsapplied);
         $skipped = array_merge($settingsskipped, $pluginsskipped);
 
+        if (!$simulate) {
+            // Store it in a config setting as the last preset applied.
+            set_config('lastpresetapplied', $presetid, 'tool_admin_presets');
+        }
+
         return [$applied, $skipped];
     }
 

diff --git a/admin/tool/admin_presets/tests/manager_test.php b/admin/tool/admin_presets/tests/manager_test.php
@@ -236,6 +236,14 @@ public function test_apply_preset(): void {
         $this->assertArrayHasKey('assign', $enabledplugins);
         $enabledplugins = \core\plugininfo\qtype::get_enabled_plugins();
         $this->assertArrayHasKey('truefalse', $enabledplugins);
+
+        // Check the presetid has been also stored in the lastpresetapplied config setting.
+        $this->assertEquals($presetid, get_config('tool_admin_presets', 'lastpresetapplied'));
+
+        // Call apply_preset as a simulation, so it shouldn't be applied and lastpresetapplied should still be $presetid.
+        $presetid2 = $generator->create_preset();
+        $manager->apply_preset($presetid2, true);
+        $this->assertEquals($presetid, get_config('tool_admin_presets', 'lastpresetapplied'));
     }