moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-61971-master' of git://github.com/mickhawkins/moodle

Browse source
This commit is contained in:
Jake Dallimore 2018-05-10 16:23:22 +08:00
commit eac66ff63c
5 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
admin/tool/dataprivacy/classes/output/data_requests_page.php
View file

@ -73,6 +73,11 @@ class data_requests_page implements renderable, templatable {
$data->newdatarequesturl = new moodle_url('/admin/tool/dataprivacy/createdatarequest.php');
$data->newdatarequesturl->param('manage', true);
if (!is_https()) {
$httpwarningmessage = get_string('httpwarning', 'tool_dataprivacy');
$data->httpsite = array('message' => $httpwarningmessage, 'announce' => 1);
}
$requests = [];
foreach ($this->requests as $request) {
$requestid = $request->get('id');

5
admin/tool/dataprivacy/classes/output/my_data_requests_page.php
View file

@ -70,6 +70,11 @@ class my_data_requests_page implements renderable, templatable {
$data = new stdClass();
$data->newdatarequesturl = new moodle_url('/admin/tool/dataprivacy/createdatarequest.php');
if (!is_https()) {
$httpwarningmessage = get_string('httpwarning', 'tool_dataprivacy');
$data->httpsite = array('message' => $httpwarningmessage, 'announce' => 1);
}
$requests = [];
foreach ($this->requests as $request) {
$requestid = $request->get('id');

1
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
View file

@ -136,6 +136,7 @@ $string['gdpr_art_9_2_i_name'] = 'Public health (GDPR Art. 9.2(i))';
$string['gdpr_art_9_2_j_description'] = 'Processing is necessary for archiving purposes in the public interest, scientific or historical research purposes or statistical purposes in accordance with Article 89(1) based on Union or Member State law which shall be proportionate to the aim pursued, respect the essence of the right to data protection and provide for suitable and specific measures to safeguard the fundamental rights and the interests of the data subject';
$string['gdpr_art_9_2_j_name'] = 'Public interest, or scientific/historical/statistical research (GDPR Art. 9.2(j))';
$string['hide'] = 'Collapse all';
$string['httpwarning'] = 'Any data downloaded from this site may not be encrypted. Please contact your system administrator and request that they install SSL on this site.';
$string['inherit'] = 'Inherit';
$string['lawfulbases'] = 'Lawful bases';
$string['lawfulbases_help'] = 'Select at least one option that will serve as the lawful basis for processing personal data. For details on these lawful bases, please see <a href="https://gdpr-info.eu/art-6-gdpr/" target="_blank">GDPR Art. 6.1</a>';

4
admin/tool/dataprivacy/templates/data_requests.mustache
View file

@ -95,6 +95,10 @@
}
}}
{{#httpsite}}
{{> core/notification_warning}}
{{/httpsite}}
<div data-region="datarequests">
<div class="m-t-1 m-b-1">
<a href="{{newdatarequesturl}}" class="btn btn-primary" data-action="new-request">

4
admin/tool/dataprivacy/templates/my_data_requests.mustache
View file

@ -75,6 +75,10 @@
}
}}
{{#httpsite}}
{{> core/notification_warning}}
{{/httpsite}}
<div data-region="datarequests">
<div class="m-t-1 m-b-1">
<a href="{{newdatarequesturl}}" class="btn btn-primary" data-action="new-request">