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

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

Browse Source
This commit is contained in:
Calen Pennington
2012-11-06 16:13:31 -05:00
parent e35d1483c6 a544175bef
commit bca0134a35
36 changed files with 2087 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/djangoapps/courseware/views.py
View File

@@ -217,6 +217,7 @@ def index(request, course_id, chapter=None, section=None,
'init': '',
'content': '',
'staff_access': staff_access,
'xqa_server': settings.MITX_FEATURES.get('USE_XQA_SERVER','http://xqa:server@content-qa.mitx.mit.edu/xqa')
}
chapter_descriptor = course.get_child_by_url_name(chapter)

2
lms/djangoapps/django_comment_client/tests.py
View File

@@ -19,7 +19,7 @@ class PermissionsTestCase(TestCase):
def setUp(self):
self.course_id = "MITx/6.002x/2012_Fall"
self.course_id = "edX/toy/2012_Fall"
self.moderator_role = Role.objects.get_or_create(name="Moderator", course_id=self.course_id)[0]
self.student_role = Role.objects.get_or_create(name="Student", course_id=self.course_id)[0]