From 570d2e749281fa2400b343bdf6e797e2bc775964 Mon Sep 17 00:00:00 2001 From: Amaia Anabitarte Date: Mon, 3 Jan 2022 16:03:26 +0100 Subject: [PATCH] MDL-73397 adminpresets: Remove tree-view --- admin/tool/admin_presets/styles.css | 9 ------- .../local/setting/adminpresets_setting.php | 25 ------------------- adminpresets/classes/manager.php | 5 ---- ...npresets_mod_quiz_admin_review_setting.php | 15 ----------- 4 files changed, 54 deletions(-) diff --git a/admin/tool/admin_presets/styles.css b/admin/tool/admin_presets/styles.css index 9cdf9207edf..25f20739c8b 100644 --- a/admin/tool/admin_presets/styles.css +++ b/admin/tool/admin_presets/styles.css @@ -1,12 +1,3 @@ -.admin_presets_tree_name { - padding: 0 0 4px 2px; -} - -.admin_presets_tree_value { - border: 1px solid #ccc; - padding: 0 0 4px 2px; -} - .admin_presets_error { color: red; text-align: center; diff --git a/adminpresets/classes/local/setting/adminpresets_setting.php b/adminpresets/classes/local/setting/adminpresets_setting.php index d8d69fe5b35..9c9b09ac446 100644 --- a/adminpresets/classes/local/setting/adminpresets_setting.php +++ b/adminpresets/classes/local/setting/adminpresets_setting.php @@ -54,13 +54,6 @@ class adminpresets_setting { */ protected $visiblevalue; - /** - * Text to display on the TreeView - * - * @var string - */ - protected $text; - /** * For multiple value settings, used to look for the other values * @@ -173,24 +166,6 @@ class adminpresets_setting { return $encoded; } - public function get_text() { - return $this->encode_string($this->text); - } - - /** - * Sets the text to display on the settings tree - * - * Default format: I'm a setting visible name (setting value: "VALUE") - */ - public function set_text() { - $this->set_visiblevalue(); - - $namediv = '
' . $this->settingdata->visiblename . '
'; - $valuediv = '
' . $this->visiblevalue . '
'; - - $this->text = $namediv . $valuediv . '
'; - } - public function get_attributes() { return $this->attributes; } diff --git a/adminpresets/classes/manager.php b/adminpresets/classes/manager.php index fc466905447..1fcb43a3c7e 100644 --- a/adminpresets/classes/manager.php +++ b/adminpresets/classes/manager.php @@ -279,9 +279,6 @@ class manager { } } - // Setting the text. - $setting->set_text(); - // Adding to general settings array. $settings[$values->plugin][$settingname] = $setting; } @@ -831,7 +828,6 @@ class manager { if (!empty($sitesettings[$change->plugin][$change->name])) { $actualsetting = $sitesettings[$change->plugin][$change->name]; $oldsetting = $this->get_setting($actualsetting->get_settingdata(), $change->oldvalue); - $oldsetting->set_text(); $visiblepluginname = $oldsetting->get_settingdata()->plugin; if ($visiblepluginname == 'none') { @@ -884,7 +880,6 @@ class manager { $oldsetting = $this->get_setting($actualsetting->get_settingdata(), $actualsetting->get_value()); $oldsetting->set_attribute_value($change->name, $change->oldvalue); - $oldsetting->set_text(); $varname = $change->plugin . '_' . $change->name; diff --git a/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_review_setting.php b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_review_setting.php index eb9a90e2078..102dafb12e8 100644 --- a/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_review_setting.php +++ b/mod/quiz/classes/adminpresets/adminpresets_mod_quiz_admin_review_setting.php @@ -29,21 +29,6 @@ use core_adminpresets\local\setting\adminpresets_setting; */ class adminpresets_mod_quiz_admin_review_setting extends adminpresets_setting { - /** - * Overwrite to add the reviewoptions text - */ - public function set_text() { - - $this->set_visiblevalue(); - - $name = get_string('reviewoptionsheading', 'quiz') . - ': ' . $this->settingdata->visiblename; - $namediv = '
' . $name . '
'; - $valuediv = '
' . $this->visiblevalue . '
'; - - $this->text = $namediv . $valuediv . '
'; - } - /** * The setting value is a sum of 'mod_quiz_admin_review_setting::times' */