MDL-28488 backup - '[backup|restore]:configure cap does not control import mode anymore

This commit is contained in:
Eloy Lafuente (stronk7) 2011-09-11 19:09:59 +02:00
parent 9530e1ed68
commit 2a4ba40f31
2 changed files with 22 additions and 14 deletions

View file

@ -217,15 +217,19 @@ abstract class backup_check {
} }
// Check the user has the ability to configure the backup. If not then we need // Check the user has the ability to configure the backup. If not then we need
// to lock all settings by permission so that no changes can be made. // to lock all settings by permission so that no changes can be made. This does
$hasconfigcap = has_capability('moodle/backup:configure', $coursectx, $userid); // not apply to the import facility, where the activities must be always enabled
if (!$hasconfigcap) { // to be able to pick them
$settings = $backup_controller->get_plan()->get_settings(); if ($mode != backup::MODE_IMPORT) {
foreach ($settings as $setting) { $hasconfigcap = has_capability('moodle/backup:configure', $coursectx, $userid);
if ($setting->get_name()=='filename') { if (!$hasconfigcap) {
continue; $settings = $backup_controller->get_plan()->get_settings();
foreach ($settings as $setting) {
if ($setting->get_name() == 'filename') {
continue;
}
$setting->set_status(base_setting::LOCKED_BY_PERMISSION);
} }
$setting->set_status(base_setting::LOCKED_BY_PERMISSION);
} }
} }

View file

@ -156,12 +156,16 @@ abstract class restore_check {
} }
// Check the user has the ability to configure the restore. If not then we need // Check the user has the ability to configure the restore. If not then we need
// to lock all settings by permission so that no changes can be made. // to lock all settings by permission so that no changes can be made. This does
$hasconfigcap = has_capability('moodle/restore:configure', $coursectx, $userid); // not apply to the import facility, where all the activities (picked on backup)
if (!$hasconfigcap) { // are restored automatically without restore UI
$settings = $restore_controller->get_plan()->get_settings(); if ($mode != backup::MODE_IMPORT) {
foreach ($settings as $setting) { $hasconfigcap = has_capability('moodle/restore:configure', $coursectx, $userid);
$setting->set_status(base_setting::LOCKED_BY_PERMISSION); if (!$hasconfigcap) {
$settings = $restore_controller->get_plan()->get_settings();
foreach ($settings as $setting) {
$setting->set_status(base_setting::LOCKED_BY_PERMISSION);
}
} }
} }