Skip to content

Hotfix/instructor dash #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
e0d merged 2 commits into from
Jul 12, 2013
Merged

Hotfix/instructor dash #385

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e62cb45
tracking in idashboard should only log json-serializable objects
ichuang Jul 8, 2013
a3e4f21
use unicode instead of str for casting track.views args in idashboard
ichuang Jul 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lms/djangoapps/instructor/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ def get_student_from_identifier(unique_student_identifier):
msg += message
if student is not None:
progress_url = reverse('student_progress', kwargs={'course_id': course_id, 'student_id': student.id})
track.views.server_track(request, "get-student-progress-page", {"student": student, "instructor": request.user, "course": course_id}, page="idashboard")
track.views.server_track(request, "get-student-progress-page", {"student": unicode(student), "instructor": unicode(request.user), "course": course_id}, page="idashboard")
msg += "<a href='{0}' target='_blank'> Progress page for username: {1} with email address: {2}</a>.".format(progress_url, student.username, student.email)

#----------------------------------------
Expand Down Expand Up @@ -472,7 +472,7 @@ def domatch(x):
msg += '<font color="green">Added {0} to instructor group = {1}</font>'.format(user, group.name)
log.debug('staffgrp={0}'.format(group.name))
user.groups.add(group)
track.views.server_track(request, "add-instructor", {"instructor": user}, page="idashboard")
track.views.server_track(request, "add-instructor", {"instructor": unicode(user)}, page="idashboard")

elif action == 'Remove course staff':
uname = request.POST['staffuser']
Expand All @@ -491,7 +491,7 @@ def domatch(x):
msg += '<font color="green">Removed {0} from instructor group = {1}</font>'.format(user, group.name)
log.debug('instructorgrp={0}'.format(group.name))
user.groups.remove(group)
track.views.server_track(request, "remove-instructor", {"instructor": user}, page="idashboard")
track.views.server_track(request, "remove-instructor", {"instructor": unicode(user)}, page="idashboard")

#----------------------------------------
# DataDump
Expand Down Expand Up @@ -658,7 +658,7 @@ def getdat(u):
problem = request.POST['Problem']
nmsg, plots = psychoanalyze.generate_plots_for_problem(problem)
msg += nmsg
track.views.server_track(request, "psychometrics-histogram-generation", {"problem": problem}, page="idashboard")
track.views.server_track(request, "psychometrics-histogram-generation", {"problem": unicode(problem)}, page="idashboard")

if idash_mode == 'Psychometrics':
problems = psychoanalyze.problems_with_psychometric_data(course_id)
Expand Down Expand Up @@ -911,7 +911,7 @@ def _add_or_remove_user_group(request, username_or_email, group, group_title, ev
else:
user.groups.remove(group)
event = "add" if do_add else "remove"
track.views.server_track(request, "add-or-remove-user-group", {"event_name": event_name, "user": user, "event": event}, page="idashboard")
track.views.server_track(request, "add-or-remove-user-group", {"event_name": event_name, "user": unicode(user), "event": event}, page="idashboard")

return msg

Expand Down