Commit 640d00c5 by Adam Palay

strip processed fields in instructor dash

parent 2c0a08f7
...@@ -233,7 +233,7 @@ def modify_access(request, course_id): ...@@ -233,7 +233,7 @@ def modify_access(request, course_id):
request.user, course_id, 'instructor', depth=None request.user, course_id, 'instructor', depth=None
) )
email = request.GET.get('email') email = _clean_field(request.GET.get('email'))
rolename = request.GET.get('rolename') rolename = request.GET.get('rolename')
action = request.GET.get('action') action = request.GET.get('action')
...@@ -433,7 +433,7 @@ def get_student_progress_url(request, course_id): ...@@ -433,7 +433,7 @@ def get_student_progress_url(request, course_id):
'progress_url': '/../...' 'progress_url': '/../...'
} }
""" """
student_email = request.GET.get('student_email') student_email = _clean_field(request.GET.get('student_email'))
user = User.objects.get(email=student_email) user = User.objects.get(email=student_email)
progress_url = reverse('student_progress', kwargs={'course_id': course_id, 'student_id': user.id}) progress_url = reverse('student_progress', kwargs={'course_id': course_id, 'student_id': user.id})
...@@ -474,8 +474,8 @@ def reset_student_attempts(request, course_id): ...@@ -474,8 +474,8 @@ def reset_student_attempts(request, course_id):
request.user, course_id, 'staff', depth=None request.user, course_id, 'staff', depth=None
) )
problem_to_reset = request.GET.get('problem_to_reset') problem_to_reset = _clean_field(request.GET.get('problem_to_reset'))
student_email = request.GET.get('student_email') student_email = _clean_field(request.GET.get('student_email'))
all_students = request.GET.get('all_students', False) in ['true', 'True', True] all_students = request.GET.get('all_students', False) in ['true', 'True', True]
delete_module = request.GET.get('delete_module', False) in ['true', 'True', True] delete_module = request.GET.get('delete_module', False) in ['true', 'True', True]
...@@ -531,8 +531,8 @@ def rescore_problem(request, course_id): ...@@ -531,8 +531,8 @@ def rescore_problem(request, course_id):
all_students and student_email cannot both be present. all_students and student_email cannot both be present.
""" """
problem_to_reset = request.GET.get('problem_to_reset') problem_to_reset = _clean_field(request.GET.get('problem_to_reset'))
student_email = request.GET.get('student_email', False) student_email = _clean_field(request.GET.get('student_email', False))
all_students = request.GET.get('all_students') in ['true', 'True', True] all_students = request.GET.get('all_students') in ['true', 'True', True]
if not (problem_to_reset and (all_students or student_email)): if not (problem_to_reset and (all_students or student_email)):
...@@ -576,8 +576,8 @@ def list_instructor_tasks(request, course_id): ...@@ -576,8 +576,8 @@ def list_instructor_tasks(request, course_id):
- `problem_urlname` and `student_email` lists task - `problem_urlname` and `student_email` lists task
history for problem AND student (intersection) history for problem AND student (intersection)
""" """
problem_urlname = request.GET.get('problem_urlname', False) problem_urlname = _clean_field(request.GET.get('problem_urlname', False))
student_email = request.GET.get('student_email', False) student_email = _clean_field(request.GET.get('student_email', False))
if student_email and not problem_urlname: if student_email and not problem_urlname:
return HttpResponseBadRequest( return HttpResponseBadRequest(
...@@ -693,7 +693,7 @@ def update_forum_role_membership(request, course_id): ...@@ -693,7 +693,7 @@ def update_forum_role_membership(request, course_id):
request.user, course_id, FORUM_ROLE_ADMINISTRATOR request.user, course_id, FORUM_ROLE_ADMINISTRATOR
) )
email = request.GET.get('email') email = _clean_field(request.GET.get('email'))
rolename = request.GET.get('rolename') rolename = request.GET.get('rolename')
action = request.GET.get('action') action = request.GET.get('action')
...@@ -815,3 +815,8 @@ def _msk_from_problem_urlname(course_id, urlname): ...@@ -815,3 +815,8 @@ def _msk_from_problem_urlname(course_id, urlname):
(org, course_name, __) = course_id.split("/") (org, course_name, __) = course_id.split("/")
module_state_key = "i4x://" + org + "/" + course_name + "/" + urlname module_state_key = "i4x://" + org + "/" + course_name + "/" + urlname
return module_state_key return module_state_key
def _clean_field(field):
if field:
return field.strip()
return field
...@@ -171,6 +171,9 @@ def instructor_dashboard(request, course_id): ...@@ -171,6 +171,9 @@ def instructor_dashboard(request, course_id):
Form is either urlname or modulename/urlname. If no modulename Form is either urlname or modulename/urlname. If no modulename
is provided, "problem" is assumed. is provided, "problem" is assumed.
""" """
# remove whitespace
urlname = _clean_field(urlname)
# tolerate an XML suffix in the urlname # tolerate an XML suffix in the urlname
if urlname[-4:] == ".xml": if urlname[-4:] == ".xml":
urlname = urlname[:-4] urlname = urlname[:-4]
...@@ -185,6 +188,7 @@ def instructor_dashboard(request, course_id): ...@@ -185,6 +188,7 @@ def instructor_dashboard(request, course_id):
def get_student_from_identifier(unique_student_identifier): def get_student_from_identifier(unique_student_identifier):
"""Gets a student object using either an email address or username""" """Gets a student object using either an email address or username"""
unique_student_identifier = _clean_field(unique_student_identifier)
msg = "" msg = ""
try: try:
if "@" in unique_student_identifier: if "@" in unique_student_identifier:
...@@ -706,12 +710,14 @@ def instructor_dashboard(request, course_id): ...@@ -706,12 +710,14 @@ def instructor_dashboard(request, course_id):
html_message = request.POST.get("message") html_message = request.POST.get("message")
text_message = html_to_text(html_message) text_message = html_to_text(html_message)
email = CourseEmail(course_id=course_id, email = CourseEmail(
course_id=course_id,
sender=request.user, sender=request.user,
to_option=email_to_option, to_option=email_to_option,
subject=email_subject, subject=email_subject,
html_message=html_message, html_message=html_message,
text_message=text_message) text_message=text_message
)
email.save() email.save()
...@@ -994,6 +1000,7 @@ def _add_or_remove_user_group(request, username_or_email, group, group_title, ev ...@@ -994,6 +1000,7 @@ def _add_or_remove_user_group(request, username_or_email, group, group_title, ev
to do. to do.
""" """
user = None user = None
username_or_email = _clean_field(username_or_email)
try: try:
if '@' in username_or_email: if '@' in username_or_email:
user = User.objects.get(email=username_or_email) user = User.objects.get(email=username_or_email)
...@@ -1561,3 +1568,9 @@ def get_background_task_table(course_id, problem_url, student=None): ...@@ -1561,3 +1568,9 @@ def get_background_task_table(course_id, problem_url, student=None):
datatable['title'] = "{course_id} > {location}".format(course_id=course_id, location=problem_url) datatable['title'] = "{course_id} > {location}".format(course_id=course_id, location=problem_url)
return msg, datatable return msg, datatable
def _clean_field(field):
if field:
return field.strip()
return field
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment