Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add some field specific error messages regarding uniqueness

Browse Source
This commit is contained in:
Chris Dodge
2013-07-25 21:47:34 -04:00
committed by Brian Talbot
parent 2c61ad45bd
commit f29819ca4a
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cms/djangoapps/contentstore/views/course.py
View File

@@ -121,13 +121,21 @@ def create_new_course(request):
return JsonResponse(
{
'ErrMsg': _('There is already a course defined with the same organization, course number, and course run. Please change at least one field to be unique.'),
'OrgErrMsg': _('Either of organization or course number must be unique.'),
'CourseErrMsg': _('Either of organization or course number must be unique.'),
}
)
course_search_location = ['i4x', dest_location.org, dest_location.course, 'course', None]
courses = modulestore().get_items(course_search_location)
if len(courses) > 0:
return JsonResponse({'ErrMsg': _('There is already a course defined with the same organization and course number. Please change at least one field to be unique.')})
return JsonResponse(
{
'ErrMsg': _('There is already a course defined with the same organization and course number. Please change at least one field to be unique.'),
'OrgErrMsg': _('Either of organization or course number must be unique.'),
'CourseErrMsg': _('Either of organization or course number must be unique.'),
}
)
# instantiate the CourseDescriptor and then persist it
# note: no system to pass

4
cms/static/js/base.js
View File

@@ -677,7 +677,9 @@ function saveNewCourse(e) {
if (data.id !== undefined) {
window.location = '/' + data.id.replace(/.*:\/\//, '');
} else if (data.ErrMsg !== undefined) {
setNewCourseErrMsgs(data.ErrMsg, null, null, null, null);
orgErrMsg = (data.OrgErrMsg !== undefined) ? data.OrgErrMsg : null;
courseErrMsg = (data.CourseErrMsg !== undefined) ? data.CourseErrMsg : null;
setNewCourseErrMsgs(data.ErrMsg, null, orgErrMsg, courseErrMsg, null);
}
}
);