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

MDL-41417 course: fixed idnumbertaken string

Browse Source
This commit is contained in:
Sam Hemelryk
2013-09-09 12:15:59 +12:00
parent eae5890112
commit b7a4701d1f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/edit_form.php
+1 -1
View File
@@ -343,7 +343,7 @@ class course_edit_form extends moodleform {
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('idnumbertaken', 'error');
}
}
}
course/lib.php
+1 -1
View File
@@ -3972,7 +3972,7 @@ function update_course($data, $editoroptions = NULL) {
// Check we don't have a duplicate idnumber.
if (!empty($data->idnumber) && $oldcourse->idnumber != $data->idnumber) {
if ($DB->record_exists('course', array('idnumber' => $data->idnumber))) {
throw new moodle_exception('courseidnumbertaken', '', '', $data->idnumber);
throw new moodle_exception('idnumbertaken', 'error');
}
}
course/tests/courselib_test.php
+1 -1
View File
@@ -130,7 +130,7 @@ class courselib_testcase extends advanced_testcase {
update_course($created2);
$this->fail('Expected exception when trying to update a course with duplicate idnumber');
} catch (moodle_exception $e) {
$this->assertEquals(get_string('courseidnumbertaken', 'error', $created2->idnumber), $e->getMessage());
$this->assertEquals(get_string('idnumbertaken', 'error'), $e->getMessage());
}
// Test duplicate shortname.