moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle

Browse source
This commit is contained in:
David Monllao 2016-07-12 14:53:32 +02:00
commit eb4f0d9c84
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
admin/tool/recyclebin/lib.php
View file

@ -158,6 +158,12 @@ function tool_recyclebin_pre_course_module_delete($cm) {
* @param \stdClass $course The course record. * @param \stdClass $course The course record.
*/ */
function tool_recyclebin_pre_course_delete($course) { function tool_recyclebin_pre_course_delete($course) {
// It is possible that the course deletion which triggered this hook
// was from an in progress course restore. In that case we do not want
// it in the recycle bin.
if (isset($course->deletesource) && $course->deletesource == 'restore') {
return;
}
// Delete all the items in the course recycle bin, regardless if it enabled or not. // Delete all the items in the course recycle bin, regardless if it enabled or not.
// It may have been enabled, then disabled later on, so may still have content. // It may have been enabled, then disabled later on, so may still have content.
$coursebin = new \tool_recyclebin\course_bin($course->id); $coursebin = new \tool_recyclebin\course_bin($course->id);

11
admin/tool/recyclebin/tests/category_bin_test.php
View file

@ -38,6 +38,11 @@ class tool_recyclebin_category_bin_tests extends advanced_testcase {
*/ */
protected $course; protected $course;
/**
* @var stdClass $coursebeingrestored
*/
protected $coursebeingrestored;
/** /**
* Setup for each test. * Setup for each test.
*/ */
@ -57,10 +62,16 @@ class tool_recyclebin_category_bin_tests extends advanced_testcase {
public function test_pre_course_delete_hook() { public function test_pre_course_delete_hook() {
global $DB; global $DB;
// This simulates a temporary course being cleaned up by a course restore.
$this->coursebeingrestored = $this->getDataGenerator()->create_course();
$this->coursebeingrestored->deletesource = 'restore';
// Should have nothing in the recycle bin. // Should have nothing in the recycle bin.
$this->assertEquals(0, $DB->count_records('tool_recyclebin_category')); $this->assertEquals(0, $DB->count_records('tool_recyclebin_category'));
delete_course($this->course, false); delete_course($this->course, false);
// This should not be added to the recycle bin.
delete_course($this->coursebeingrestored, false);
// Check the course is now in the recycle bin. // Check the course is now in the recycle bin.
$this->assertEquals(1, $DB->count_records('tool_recyclebin_category')); $this->assertEquals(1, $DB->count_records('tool_recyclebin_category'));

6
backup/util/ui/restore_ui.class.php
View file

@ -231,9 +231,11 @@ class restore_ui extends base_ui {
* Delete course which is created by restore process * Delete course which is created by restore process
*/ */
public function cleanup() { public function cleanup() {
global $DB;
$courseid = $this->controller->get_courseid(); $courseid = $this->controller->get_courseid();
if ($this->is_temporary_course_created($courseid)) { if ($this->is_temporary_course_created($courseid) && $course = $DB->get_record('course', array('id' => $courseid))) {
delete_course($courseid, false); $course->deletesource = 'restore';
delete_course($course, false);
} }
} }