L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-63919 tool_dataprivacy: admin & notify fixes

Browse Source 
This includes the following:

1) Replace $ADMIN->id by get_admin()->id. The former doesn't exist.
2) Only change the notify parameter when it has not been specified
   at creation time (null). If specified, observe it.
3) Set the current user in tests to admin, able to create those
   requests.
This commit is contained in:
Eloy Lafuente (stronk7)
2018-11-10 02:22:12 +01:00
parent 5c0f8dcddf
commit baf3fd4177
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/dataprivacy/classes/api.php
+10 -7
View File
@@ -234,13 +234,16 @@ class api {
$creationmethod = data_request::DATAREQUEST_CREATION_MANUAL,
$notify = null
) {
global $USER, $ADMIN;
global $USER;
if (null === $notify && data_request::DATAREQUEST_CREATION_AUTO == $creationmethod) {
// If the request was automatically created, then do not notify unless explicitly set.
$notify = false;
} else {
$notify = true;
if (null === $notify) {
// Only if notifications have not been decided by caller.
if ( data_request::DATAREQUEST_CREATION_AUTO == $creationmethod) {
// If the request was automatically created, then do not notify unless explicitly set.
$notify = false;
} else {
$notify = true;
}
}
$datarequest = new data_request();
@@ -251,7 +254,7 @@ class api {
// NOTE: This should probably be changed. We should leave the default value for $requestinguser if
// the request is not explicitly created by a specific user.
$requestinguser = (isguestuser() && $creationmethod == data_request::DATAREQUEST_CREATION_AUTO) ?
$ADMIN->id : $USER->id;
get_admin()->id : $USER->id;
// The user making the request.
$datarequest->set('requestedby', $requestinguser);
// Set status.