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

Unicode fixes for log messages and other things

Browse Source
This commit is contained in:
Omar Al-Ithawi
2015-02-03 13:01:22 +02:00
parent 6266dcf1e7
commit 4e733c6e1f
13 changed files with 162 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/djangoapps/instructor/views/api.py
View File

@@ -353,12 +353,20 @@ def register_and_enroll_students(request, course_id): # pylint: disable=too-man
'username': username, 'email': email, 'response': warning_message})
log.warning('email {email} already exist'.format(email=email))
else:
log.info("user already exists with username '{username}' and email '{email}'".format(email=email, username=username))
log.info(
u"user already exists with username '%s' and email '%s'",
email=email,
username=username,
)
# make sure user is enrolled in course
if not CourseEnrollment.is_enrolled(user, course_id):
CourseEnrollment.enroll(user, course_id)
log.info('user {username} enrolled in the course {course}'.format(username=username, course=course.id))
log.info(
u'user %s enrolled in the course %s',
username=username,
course=course.id,
)
enroll_email(course_id=course_id, student_email=email, auto_enroll=True, email_students=True, email_params=email_params)
else:
# This email does not yet exist, so we need to create a new account

10
lms/djangoapps/instructor/views/legacy.py
View File

@@ -252,9 +252,11 @@ def instructor_dashboard(request, course_id):
try:
ddata.append([student.email, student.grades[aidx]])
except IndexError:
log.debug('No grade for assignment {idx} ({name}) for student {email}'.format(
idx=aidx, name=aname, email=student.email)
)
log.debug(u'No grade for assignment %(idx)s (%(name)s) for student %(email)s', {
"idx": aidx,
"name": aname,
"email": student.email,
})
datatable['data'] = ddata
datatable['title'] = _('Grades for assignment "{name}"').format(name=aname)
@@ -749,7 +751,7 @@ def get_student_grade_summary_data(request, course, get_grades=True, get_raw_sco
if get_grades:
gradeset = student_grades(student, request, course, keep_raw_scores=get_raw_scores, use_offline=use_offline)
log.debug('student={0}, gradeset={1}'.format(student, gradeset))
log.debug(u'student=%s, gradeset=%s', student, gradeset)
with gtab.add_row(student.id) as add_grade:
if get_raw_scores:
# TODO (ichuang) encode Score as dict instead of as list, so score[0] -> score['earned']