diff --git a/adminpresets/classes/helper.php b/admin/presets/classes/helper.php similarity index 100% rename from adminpresets/classes/helper.php rename to admin/presets/classes/helper.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_bloglevel.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_bloglevel.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_bloglevel.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_bloglevel.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configcheckbox.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configcheckbox.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_advanced.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_advanced.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_advanced.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_advanced.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_lock.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_lock.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_lock.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_lock.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configiplist.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configiplist.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configiplist.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configiplist.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configmulticheckbox.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configmulticheckbox.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configmulticheckbox.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configmulticheckbox.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configmultiselect_with_loader.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect_with_loader.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configmultiselect_with_loader.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect_with_loader.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configselect.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configselect.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configselect.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configselect.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configselect_with_advanced.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configselect_with_advanced.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configselect_with_advanced.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configselect_with_advanced.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configtext.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configtext.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configtext.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configtext.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configtext_with_advanced.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configtext_with_advanced.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configtext_with_advanced.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configtext_with_advanced.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_configtime.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_configtime.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_configtime.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_configtime.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_devicedetectregex.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_devicedetectregex.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_devicedetectregex.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_devicedetectregex.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_gradecat_combo.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_gradecat_combo.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_gradecat_combo.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_gradecat_combo.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_sitesettext.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_sitesettext.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_sitesettext.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_sitesettext.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_special_calendar_weekend.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_special_calendar_weekend.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_special_calendar_weekend.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_special_calendar_weekend.php diff --git a/adminpresets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php b/admin/presets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php rename to admin/presets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php diff --git a/adminpresets/classes/local/setting/adminpresets_setting.php b/admin/presets/classes/local/setting/adminpresets_setting.php similarity index 100% rename from adminpresets/classes/local/setting/adminpresets_setting.php rename to admin/presets/classes/local/setting/adminpresets_setting.php diff --git a/adminpresets/classes/local/setting/delegation.php b/admin/presets/classes/local/setting/delegation.php similarity index 100% rename from adminpresets/classes/local/setting/delegation.php rename to admin/presets/classes/local/setting/delegation.php diff --git a/adminpresets/classes/manager.php b/admin/presets/classes/manager.php similarity index 100% rename from adminpresets/classes/manager.php rename to admin/presets/classes/manager.php diff --git a/adminpresets/classes/privacy/provider.php b/admin/presets/classes/privacy/provider.php similarity index 100% rename from adminpresets/classes/privacy/provider.php rename to admin/presets/classes/privacy/provider.php diff --git a/adminpresets/tests/fixtures/import_settings.xml b/admin/presets/tests/fixtures/import_settings.xml similarity index 100% rename from adminpresets/tests/fixtures/import_settings.xml rename to admin/presets/tests/fixtures/import_settings.xml diff --git a/adminpresets/tests/fixtures/import_settings_plugins.xml b/admin/presets/tests/fixtures/import_settings_plugins.xml similarity index 100% rename from adminpresets/tests/fixtures/import_settings_plugins.xml rename to admin/presets/tests/fixtures/import_settings_plugins.xml diff --git a/adminpresets/tests/fixtures/import_settings_with_unexisting_setting.xml b/admin/presets/tests/fixtures/import_settings_with_unexisting_setting.xml similarity index 100% rename from adminpresets/tests/fixtures/import_settings_with_unexisting_setting.xml rename to admin/presets/tests/fixtures/import_settings_with_unexisting_setting.xml diff --git a/adminpresets/tests/fixtures/import_starter_name.xml b/admin/presets/tests/fixtures/import_starter_name.xml similarity index 100% rename from adminpresets/tests/fixtures/import_starter_name.xml rename to admin/presets/tests/fixtures/import_starter_name.xml diff --git a/adminpresets/tests/fixtures/invalid_xml_file.xml b/admin/presets/tests/fixtures/invalid_xml_file.xml similarity index 100% rename from adminpresets/tests/fixtures/invalid_xml_file.xml rename to admin/presets/tests/fixtures/invalid_xml_file.xml diff --git a/adminpresets/tests/fixtures/unexisting_category.xml b/admin/presets/tests/fixtures/unexisting_category.xml similarity index 100% rename from adminpresets/tests/fixtures/unexisting_category.xml rename to admin/presets/tests/fixtures/unexisting_category.xml diff --git a/adminpresets/tests/fixtures/unexisting_setting.xml b/admin/presets/tests/fixtures/unexisting_setting.xml similarity index 100% rename from adminpresets/tests/fixtures/unexisting_setting.xml rename to admin/presets/tests/fixtures/unexisting_setting.xml diff --git a/adminpresets/tests/generator/lib.php b/admin/presets/tests/generator/lib.php similarity index 100% rename from adminpresets/tests/generator/lib.php rename to admin/presets/tests/generator/lib.php diff --git a/adminpresets/tests/generator_test.php b/admin/presets/tests/generator_test.php similarity index 100% rename from adminpresets/tests/generator_test.php rename to admin/presets/tests/generator_test.php diff --git a/adminpresets/tests/helper_test.php b/admin/presets/tests/helper_test.php similarity index 100% rename from adminpresets/tests/helper_test.php rename to admin/presets/tests/helper_test.php diff --git a/adminpresets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php b/admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php similarity index 100% rename from adminpresets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php rename to admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php diff --git a/adminpresets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php b/admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php similarity index 100% rename from adminpresets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php rename to admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php diff --git a/adminpresets/tests/local/setting/adminpresets_setting_test.php b/admin/presets/tests/local/setting/adminpresets_setting_test.php similarity index 100% rename from adminpresets/tests/local/setting/adminpresets_setting_test.php rename to admin/presets/tests/local/setting/adminpresets_setting_test.php diff --git a/adminpresets/tests/manager_test.php b/admin/presets/tests/manager_test.php similarity index 100% rename from adminpresets/tests/manager_test.php rename to admin/presets/tests/manager_test.php diff --git a/adminpresets/tests/privacy/privacy_provider_test.php b/admin/presets/tests/privacy/privacy_provider_test.php similarity index 100% rename from adminpresets/tests/privacy/privacy_provider_test.php rename to admin/presets/tests/privacy/privacy_provider_test.php diff --git a/admin/tool/admin_presets/tests/behat/import_file.feature b/admin/tool/admin_presets/tests/behat/import_file.feature index c378d8676cd..291c0b5ee02 100644 --- a/admin/tool/admin_presets/tests/behat/import_file.feature +++ b/admin/tool/admin_presets/tests/behat/import_file.feature @@ -10,7 +10,7 @@ Feature: I can upload a preset file Given I should see "Import site admin preset" And I click on "Import" "button" And I should see "You must supply a value here" - And I upload "adminpresets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager + And I upload "admin/presets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager And I click on "Import" "button" And I should see "Setting changes" And I should see "Imported preset" @@ -31,7 +31,7 @@ Feature: I can upload a preset file Scenario: Rename imported settings Given I should see "Import site admin preset" And I set the field "Name" to "Renamed preset" - And I upload "adminpresets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager + And I upload "admin/presets/tests/fixtures/import_settings_plugins.xml" file to "Select file" filemanager And I click on "Import" "button" And I should not see "Imported preset" And I should see "Renamed preset" @@ -42,7 +42,7 @@ Feature: I can upload a preset file Scenario: Import settings from an invalid XML file Given I set the field "Name" to "Renamed preset" - And I upload "adminpresets/tests/fixtures/invalid_xml_file.xml" file to "Select file" filemanager + And I upload "admin/presets/tests/fixtures/invalid_xml_file.xml" file to "Select file" filemanager When I click on "Import" "button" Then I should see "Wrong file" And I should not see "Setting changes" @@ -51,7 +51,7 @@ Feature: I can upload a preset file Scenario: Import unexisting settings category Given I set the field "Name" to "Renamed preset" - And I upload "adminpresets/tests/fixtures/unexisting_category.xml" file to "Select file" filemanager + And I upload "admin/presets/tests/fixtures/unexisting_category.xml" file to "Select file" filemanager When I click on "Import" "button" Then I should see "No valid settings" And I should not see "Setting changes" @@ -63,7 +63,7 @@ Feature: I can upload a preset file | debug | 0 | | debugdisplay | 0 | And I set the field "Name" to "Renamed preset" - And I upload "adminpresets/tests/fixtures/import_settings_with_unexisting_setting.xml" file to "Select file" filemanager + And I upload "admin/presets/tests/fixtures/import_settings_with_unexisting_setting.xml" file to "Select file" filemanager When I click on "Import" "button" And I should see "Setting changes" And I should see "Enable portfolios" in the "core" "table_row" diff --git a/admin/tool/admin_presets/tests/generator/lib.php b/admin/tool/admin_presets/tests/generator/lib.php index ec0de517717..07e3e0fa312 100644 --- a/admin/tool/admin_presets/tests/generator/lib.php +++ b/admin/tool/admin_presets/tests/generator/lib.php @@ -17,7 +17,7 @@ defined('MOODLE_INTERNAL') || die(); global $CFG; -require_once($CFG->dirroot . '/adminpresets/tests/generator/lib.php'); +require_once($CFG->dirroot . '/admin/presets/tests/generator/lib.php'); /** * Data generator the admin_presets tool. diff --git a/admin/tool/admin_presets/tests/local/action/import_test.php b/admin/tool/admin_presets/tests/local/action/import_test.php index 10403ee49bf..e59c31e5404 100644 --- a/admin/tool/admin_presets/tests/local/action/import_test.php +++ b/admin/tool/admin_presets/tests/local/action/import_test.php @@ -189,7 +189,7 @@ class import_test extends \advanced_testcase { * @return array */ public function import_execute_provider(): array { - $fixturesfolder = __DIR__ . '/../../../../../../adminpresets/tests/fixtures/'; + $fixturesfolder = __DIR__ . '/../../../../../presets/tests/fixtures/'; return [ 'Import settings from an empty file' => [ diff --git a/config-dist.php b/config-dist.php index fb5eeb514e7..ec68c6b2c87 100644 --- a/config-dist.php +++ b/config-dist.php @@ -1163,7 +1163,7 @@ $CFG->admin = 'admin'; // This setting accepts the following values: // - One of the core preset names (i.e "starter" or "full"). // - The path of a valid XML preset file, that will be imported and applied. Absolute paths are recommended, to -// guarantee the file is found: i.e."MOODLEPATH/adminpresets/tests/fixtures/import_settings_plugins.xml". +// guarantee the file is found: i.e."MOODLEPATH/admin/presets/tests/fixtures/import_settings_plugins.xml". // // This setting is only used during the installation process. So once the Moodle site is installed, it is ignored. // diff --git a/lib/components.json b/lib/components.json index 19ca1243fd8..eaaf7d4e9fd 100644 --- a/lib/components.json +++ b/lib/components.json @@ -45,7 +45,7 @@ "subsystems": { "access": null, "admin": "admin", - "adminpresets": "adminpresets", + "adminpresets": "admin/presets", "analytics": "analytics", "antivirus": "lib\/antivirus", "auth": "auth", diff --git a/lib/db/install.php b/lib/db/install.php index 1f45b51cf9b..153d3b0b199 100644 --- a/lib/db/install.php +++ b/lib/db/install.php @@ -333,6 +333,6 @@ function xmldb_main_install() { badges_install_default_backpacks(); // Create default core site admin presets. - require_once($CFG->dirroot . '/adminpresets/classes/helper.php'); + require_once($CFG->dirroot . '/admin/presets/classes/helper.php'); \core_adminpresets\helper::create_default_presets(); } diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index c531c50163c..47c21bba54f 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3508,7 +3508,7 @@ privatefiles,moodle|/user/files.php'; if ($DB->count_records('adminpresets', ['iscore' => 1]) == 0) { // Create default core site admin presets. - require_once($CFG->dirroot . '/adminpresets/classes/helper.php'); + require_once($CFG->dirroot . '/admin/presets/classes/helper.php'); \core_adminpresets\helper::create_default_presets(); } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7c0661877d9..f2ef3acee87 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -209,7 +209,7 @@ reportbuilder/tests - adminpresets/tests + admin/presets/tests