mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44590-master' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Marina Glancy 2014-04-01 11:04:52 +08:00
commit 31374d59d0
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
course/classes/editcategory_form.php
View File

@ -125,10 +125,10 @@ class core_course_editcategory_form extends moodleform {
if (!empty($data['idnumber'])) {
if ($existing = $DB->get_record('course_categories', array('idnumber' => $data['idnumber']))) {
if (!$data['id'] || $existing->id != $data['id']) {
$errors['idnumber']= get_string('categoryidnumbertaken');
$errors['idnumber'] = get_string('categoryidnumbertaken', 'error');
}
}
}
return $errors;
}
}
}

14
course/tests/behat/category_management.feature
View File

@ -332,3 +332,17 @@ Feature: Test category management actions
And the "movecategoriesto" "select" should be disabled
And the "resortcategoriesby" "select" should be disabled
And the "resortcoursesby" "select" should be disabled
Scenario: Test that is not possible to create a course category with a duplicate idnumber
Given the following "categories" exists:
| name | category | idnumber |
| Cat 1 | 0 | CAT1 |
And I log in as "admin"
And I expand "Site administration" node
And I expand "Courses" node
And I follow "Add a category"
And I set the following fields to these values:
| Category name | Test duplicate |
| Category ID number | CAT1 |
When I press "Create category"
Then I should see "ID number is already used for another category"