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

Merge pull request #3037 from edx/will/tim-installation-rebase

Browse Source 
Install new ORA (edx-tim)
This commit is contained in:
Will Daly
2014-03-25 10:59:05 -04:00
parent 274224bf6c 440d9ddb89
commit ba00a442d7
7 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/djangoapps/contentstore/tests/test_contentstore.py
View File

@@ -143,7 +143,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
self.check_components_on_page(
ADVANCED_COMPONENT_TYPES,
['Word cloud', 'Annotation', 'Text Annotation', 'Video Annotation',
'Open Response Assessment', 'Peer Grading Interface'],
'Open Response Assessment', 'Peer Grading Interface', 'openassessment'],
)
def test_advanced_components_require_two_clicks(self):

1
cms/djangoapps/contentstore/views/component.py
View File

@@ -60,6 +60,7 @@ else:
'word_cloud',
'graphical_slider_tool',
'lti',
'openassessment', # edx-ora2
] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES
ADVANCED_COMPONENT_CATEGORY = 'advanced'

7
cms/envs/common.py
View File

@@ -553,6 +553,13 @@ MAX_FAILED_LOGIN_ATTEMPTS_LOCKOUT_PERIOD_SECS = 15 * 60
OPTIONAL_APPS = (
'edx_jsdraw',
'mentoring',
# edx-ora2
'submissions',
'openassessment',
'openassessment.assessment',
'openassessment.workflow',
'openassessment.xblock'
)
for app_name in OPTIONAL_APPS: