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

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Browse Source 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
This commit is contained in:
Calen Pennington
2014-05-16 14:01:20 -04:00
parent af8cab2a37 6396373bd5
commit 18c91d0f1d
49 changed files with 1226 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/djangoapps/notes/views.py
View File

@@ -4,7 +4,6 @@ from edxmako.shortcuts import render_to_response
from courseware.courses import get_course_with_access
from notes.models import Note
from notes.utils import notes_enabled_for_course
from xmodule.annotator_token import retrieve_token
@login_required
@@ -23,8 +22,7 @@ def notes(request, course_id):
'course': course,
'notes': notes,
'student': student,
'storage': storage,
'token': retrieve_token(student.email, course.annotation_token_secret),
'storage': storage
}
return render_to_response('notes.html', context)