From 7ef99fc21326da1e9e17b5341c5c7e6ba2ea26e8 Mon Sep 17 00:00:00 2001 From: Mihail Geshoski Date: Thu, 13 Sep 2018 14:44:26 +0800 Subject: [PATCH] MDL-61908 privacy: Fix heading in data privacy pages --- admin/tool/dataprivacy/categories.php | 1 + admin/tool/dataprivacy/classes/page_helper.php | 4 ++-- admin/tool/dataprivacy/createdatarequest.php | 4 ++-- admin/tool/dataprivacy/datadeletion.php | 1 + admin/tool/dataprivacy/dataregistry.php | 1 + admin/tool/dataprivacy/defaults.php | 1 + admin/tool/dataprivacy/lang/en/tool_dataprivacy.php | 1 + admin/tool/dataprivacy/purposes.php | 1 + admin/tool/dataprivacy/templates/categories.mustache | 1 - admin/tool/dataprivacy/templates/purposes.mustache | 1 - 10 files changed, 10 insertions(+), 6 deletions(-) diff --git a/admin/tool/dataprivacy/categories.php b/admin/tool/dataprivacy/categories.php index f323278844b..aa589173396 100644 --- a/admin/tool/dataprivacy/categories.php +++ b/admin/tool/dataprivacy/categories.php @@ -33,6 +33,7 @@ $title = get_string('editcategories', 'tool_dataprivacy'); $output = $PAGE->get_renderer('tool_dataprivacy'); echo $output->header(); +echo $output->heading($title); $categories = \tool_dataprivacy\api::get_categories(); $renderable = new \tool_dataprivacy\output\categories($categories); diff --git a/admin/tool/dataprivacy/classes/page_helper.php b/admin/tool/dataprivacy/classes/page_helper.php index 0a8cf7317f3..d7ec6f72a6b 100644 --- a/admin/tool/dataprivacy/classes/page_helper.php +++ b/admin/tool/dataprivacy/classes/page_helper.php @@ -47,7 +47,7 @@ class page_helper { */ public static function setup(moodle_url $url, $title, $attachtoparentnode = '', $requiredcapability = 'tool/dataprivacy:managedataregistry') { - global $PAGE; + global $PAGE, $SITE; $context = context_system::instance(); @@ -65,7 +65,7 @@ class page_helper { $PAGE->set_context($context); $PAGE->set_pagelayout('admin'); $PAGE->set_title($title); - $PAGE->set_heading($title); + $PAGE->set_heading($SITE->fullname); // If necessary, override the settings navigation to add this page into the breadcrumb navigation. if ($attachtoparentnode) { diff --git a/admin/tool/dataprivacy/createdatarequest.php b/admin/tool/dataprivacy/createdatarequest.php index 83a5c901406..2a2fb810904 100644 --- a/admin/tool/dataprivacy/createdatarequest.php +++ b/admin/tool/dataprivacy/createdatarequest.php @@ -78,8 +78,8 @@ if ($data = $mform->get_data()) { redirect($returnurl, $redirectmessage); } -$title = get_string('contactdataprotectionofficer', 'tool_dataprivacy'); -$PAGE->set_heading($title); +$title = get_string('createnewdatarequest', 'tool_dataprivacy'); +$PAGE->set_heading($SITE->fullname); $PAGE->set_title($title); echo $OUTPUT->header(); echo $OUTPUT->heading($title); diff --git a/admin/tool/dataprivacy/datadeletion.php b/admin/tool/dataprivacy/datadeletion.php index c92c6760591..df088ca7dce 100644 --- a/admin/tool/dataprivacy/datadeletion.php +++ b/admin/tool/dataprivacy/datadeletion.php @@ -36,6 +36,7 @@ $title = get_string('datadeletion', 'tool_dataprivacy'); \tool_dataprivacy\page_helper::setup($url, $title); echo $OUTPUT->header(); +echo $OUTPUT->heading($title); if (\tool_dataprivacy\api::is_site_dpo($USER->id)) { $table = new \tool_dataprivacy\output\expired_contexts_table($filter); diff --git a/admin/tool/dataprivacy/dataregistry.php b/admin/tool/dataprivacy/dataregistry.php index 50c0ab90602..e11c47c8d13 100644 --- a/admin/tool/dataprivacy/dataregistry.php +++ b/admin/tool/dataprivacy/dataregistry.php @@ -37,6 +37,7 @@ $title = get_string('dataregistry', 'tool_dataprivacy'); $output = $PAGE->get_renderer('tool_dataprivacy'); echo $output->header(); +echo $OUTPUT->heading($title); if (\tool_dataprivacy\api::is_site_dpo($USER->id)) { $dataregistry = new tool_dataprivacy\output\data_registry_page($contextlevel, $contextid); diff --git a/admin/tool/dataprivacy/defaults.php b/admin/tool/dataprivacy/defaults.php index 9faad87519f..e920585920a 100644 --- a/admin/tool/dataprivacy/defaults.php +++ b/admin/tool/dataprivacy/defaults.php @@ -66,5 +66,6 @@ $defaultspage = new \tool_dataprivacy\output\defaults_page($mode, $category, $pu $output = $PAGE->get_renderer('tool_dataprivacy'); echo $output->header(); +echo $output->heading($title); echo $output->render_from_template('tool_dataprivacy/defaults_page', $defaultspage->export_for_template($output)); echo $output->footer(); diff --git a/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php b/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php index 89731c012d7..9ea7efc53be 100644 --- a/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php +++ b/admin/tool/dataprivacy/lang/en/tool_dataprivacy.php @@ -61,6 +61,7 @@ $string['contextlevelname80'] = 'Blocks'; $string['contextpurposecategorysaved'] = 'Purpose and category saved.'; $string['contactdpoviaprivacypolicy'] = 'Please contact the privacy officer as described in the privacy policy.'; $string['createcategory'] = 'Create data category'; +$string['createnewdatarequest'] = 'Create a new data request'; $string['createpurpose'] = 'Create data purpose'; $string['datadeletion'] = 'Data deletion'; $string['datadeletionpagehelp'] = 'Data for which the retention period has expired are listed here. Please review and confirm data deletion, which will then be executed by the "Delete expired contexts" scheduled task.'; diff --git a/admin/tool/dataprivacy/purposes.php b/admin/tool/dataprivacy/purposes.php index 5fad9222cdc..fb1b0c54b1e 100644 --- a/admin/tool/dataprivacy/purposes.php +++ b/admin/tool/dataprivacy/purposes.php @@ -33,6 +33,7 @@ $title = get_string('editpurposes', 'tool_dataprivacy'); $output = $PAGE->get_renderer('tool_dataprivacy'); echo $output->header(); +echo $output->heading($title); $purposes = \tool_dataprivacy\api::get_purposes(); $renderable = new \tool_dataprivacy\output\purposes($purposes); diff --git a/admin/tool/dataprivacy/templates/categories.mustache b/admin/tool/dataprivacy/templates/categories.mustache index ef310417b8a..523a56b1990 100644 --- a/admin/tool/dataprivacy/templates/categories.mustache +++ b/admin/tool/dataprivacy/templates/categories.mustache @@ -51,7 +51,6 @@ {{/navigation}}
-

{{#str}}categories, tool_dataprivacy{{/str}}