mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-69448' of https://github.com/paulholden/moodle into master

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2020-09-07 23:25:49 +02:00
commit dfc09fc300
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backup/util/ui/classes/copy/copy.php
View File

@ -111,8 +111,8 @@ class copy {
* Take the validated form data and extract the required information for copy operations.
*
* @param \stdClass $formdata Data from the validated course copy form.
* @throws \moodle_exception
* @return \stdClass $copydata Data required for course copy operations.
* @throws \moodle_exception If one of the required copy fields is missing
*/
private final function get_copy_data(\stdClass $formdata): \stdClass {
$copydata = new \stdClass();
@ -121,7 +121,7 @@ class copy {
if (isset($formdata->{$field})) {
$copydata->{$field} = $formdata->{$field};
} else {
throw new \moodle_exception('copy_class_field_not_found');
throw new \moodle_exception('copyfieldnotfound', 'backup', '', null, $field);
}
}

14
backup/util/ui/classes/output/copy_form.php
View File

@ -162,15 +162,17 @@ class copy_form extends \moodleform {
}
// Keep source course user data.
$mform->addElement('select', 'userdata', get_string('userdata', 'backup'),
[0 => get_string('no'), 1 => get_string('yes')]);
$mform->setDefault('userdata', 0);
$mform->addHelpButton('userdata', 'userdata', 'backup');
$requiredcapabilities = array(
'moodle/restore:createuser', 'moodle/backup:userinfo', 'moodle/restore:userinfo'
);
if (has_all_capabilities($requiredcapabilities, $coursecontext)) {
$dataarray = array();
$dataarray[] = $mform->createElement('advcheckbox', 'userdata',
get_string('enable'), '', array('group' => 1), array(0, 1));
$mform->addGroup($dataarray, 'dataarray', get_string('userdata', 'backup'), ' ', false);
$mform->addHelpButton('dataarray', 'userdata', 'backup');
if (!has_all_capabilities($requiredcapabilities, $coursecontext)) {
$mform->hardFreeze('userdata');
$mform->setConstants('userdata', 0);
}
// Keep manual enrolments.

1
lang/en/backup.php
View File

@ -169,6 +169,7 @@ $string['copycoursetitle'] = 'Copy course: {$a}';
$string['copydest'] = 'Destination';
$string['copyingcourse'] = 'Course copying in progress';
$string['copyingcourseshortname'] = 'copying';
$string['copyfieldnotfound'] = 'A required field was not found';
$string['copyformfail'] = 'AJAX submission of course copy form has failed.';
$string['copyop'] = 'Current operation';
$string['copyprogressheading'] = 'Course copies in progress';

4
lib/classes/task/asynchronous_copy_task.php
View File

@ -72,14 +72,16 @@ class asynchronous_copy_task extends adhoc_task {
$keepuserdata = (bool)$copyinfo->userdata;
$keptroles = $copyinfo->keptroles;
$backupplan->get_setting('users')->set_value('1');
$bc->set_kept_roles($keptroles);
// If we are not keeping user data don't include users or data in the backup.
// In this case we'll add the user enrolments at the end.
// Also if we have no roles to keep don't backup users.
if (empty($keptroles) || !$keepuserdata) {
$backupplan->get_setting('users')->set_status(\backup_setting::NOT_LOCKED);
$backupplan->get_setting('users')->set_value('0');
} else {
$backupplan->get_setting('users')->set_value('1');
}
// Do some preflight checks on the backup.