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

MDL-31914 Ensure that completion criteria are deleted when removing a course module

Browse Source 
Conflicts:

	lib/db/upgrade.php
	version.php
This commit is contained in:
Andrew Robert Nicols
2012-04-24 12:25:53 +02:00
committed by Eloy Lafuente (stronk7)
parent 14ffb91959
commit ede323e2b3
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/lib.php
+2
View File
@@ -2930,6 +2930,8 @@ function delete_course_module($id) {
// very quick on an empty table)
$DB->delete_records('course_modules_completion', array('coursemoduleid' => $cm->id));
$DB->delete_records('course_modules_availability', array('coursemoduleid'=> $cm->id));
$DB->delete_records('course_completion_criteria', array('moduleinstance' => $cm->id,
'criteriatype' => COMPLETION_CRITERIA_TYPE_ACTIVITY));
delete_context(CONTEXT_MODULE, $cm->id);
return $DB->delete_records('course_modules', array('id'=>$cm->id));
lib/db/upgrade.php
+20
View File
@@ -402,5 +402,25 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2012042300.00);
}
if ($oldversion < 2012042300.02) {
require_once($CFG->libdir . '/completion/completion_criteria.php');
// Delete orphaned criteria which were left when modules were removed
if ($DB->get_dbfamily() === 'mysql') {
$sql = "DELETE cc FROM {course_completion_criteria} cc
LEFT JOIN {course_modules} cm ON cm.id = cc.moduleinstance
WHERE cm.id IS NULL AND cc.criteriatype = ".COMPLETION_CRITERIA_TYPE_ACTIVITY;
} else {
$sql = "DELETE FROM {course_completion_criteria}
WHERE NOT EXISTS (
SELECT 'x' FROM {course_modules}
WHERE {course_modules}.id = {course_completion_criteria}.moduleinstance)
AND cc.criteriatype = ".COMPLETION_CRITERIA_TYPE_ACTIVITY;
}
$DB->execute($sql);
// Main savepoint reached
upgrade_main_savepoint(true, 2012042300.02);
}
return true;
}
version.php
+1 -1
View File
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2012042300.01; // YYYYMMDD = weekly release date of this DEV branch
$version = 2012042300.02; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes