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

MDL-41417 course: allow the use of duplicated idnumbers if they existed before fix

Browse Source
This commit is contained in:
Mark Nelson
2013-09-06 15:24:43 +08:00
parent 5f8e23c1a9
commit eb57e9e60b
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/edit_form.php
+3 -3
View File
@@ -328,7 +328,7 @@ class course_edit_form extends moodleform {
/// perform some extra moodle validation
function validation($data, $files) {
global $DB, $CFG;
global $DB;
$errors = parent::validation($data, $files);
@@ -340,10 +340,10 @@ class course_edit_form extends moodleform {
}
// Add field validation check for duplicate idnumber.
if (!empty($data['idnumber'])) {
if (!empty($data['idnumber']) && (empty($data['id']) || $this->course->idnumber != $data['idnumber'])) {
if ($course = $DB->get_record('course', array('idnumber' => $data['idnumber']), '*', IGNORE_MULTIPLE)) {
if (empty($data['id']) || $course->id != $data['id']) {
$errors['idnumber']= get_string('courseidnumbertaken', 'error', $course->fullname);
$errors['idnumber'] = get_string('courseidnumbertaken', 'error', $course->fullname);
}
}
}
course/lib.php
-1
View File
@@ -3976,7 +3976,6 @@ function update_course($data, $editoroptions = NULL) {
}
}
if (!isset($data->category) or empty($data->category)) {
// prevent nulls and 0 in category field
unset($data->category);
course/tests/courselib_test.php
+3 -4
View File
@@ -101,7 +101,8 @@ class courselib_testcase extends advanced_testcase {
global $DB;
$this->resetAfterTest();
$defaultcategory = $DB->get_field_select('course_categories', "MIN(id)", "parent=0");
$defaultcategory = $DB->get_field_select('course_categories', 'MIN(id)', 'parent = 0');
$course = new stdClass();
$course->fullname = 'Apu loves Unit Təsts';
@@ -113,11 +114,10 @@ class courselib_testcase extends advanced_testcase {
$course->newsitems = 0;
$course->numsections = 5;
$course->category = $defaultcategory;
$original = (array) $course;
$created = create_course($course);
// Ensure the checks only work on idnumber/shortname that are not already ours.
$created = update_course($created);
update_course($created);
$course->shortname = 'test2';
$course->idnumber = '2';
@@ -136,7 +136,6 @@ class courselib_testcase extends advanced_testcase {
// Test duplicate shortname.
$created2->idnumber = '2';
$created2->shortname = 'test1';
try {
update_course($created2);
$this->fail('Expected exception when trying to update a course with a duplicate shortname');