Feature/cdodge/add a mixed modulestore - #722

Merged

chrisndodge merged 27 commits into

masterfrom

feature/cdodge/add-a-mixed-modulestore

Aug 17, 2013

Commits on Aug 16, 2013

initial commit for a mixed module store which can interoperate with both XML and Mongo module stores
Chris Dodge
committed
6f11b98
add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier
Chris Dodge
committed
b5253b5
WIP: added a get_modulestore_type. Added some unit tests. changed over the isinstance() with respect to modulestores to use this get_modulestore_type()
Chris Dodge
committed
8298897
remove unneeded type check on the modulestore
Chris Dodge
committed
2616d8f
WIP
Chris Dodge
committed
cff93d3
fix tests
Chris Dodge
committed
5298f54
remove debugging logging
Chris Dodge
committed
fa61bdf
remove another debug logging message
Chris Dodge
committed
54bd317
update file comment on MixedModuleStore
Chris Dodge
committed
9f14f1e
fix missed conflict resolution
Chris Dodge
committed
aa8b054
some additional comments to clarify the partially bogus course_id.
Chris Dodge
committed
e4eea6c
update SplitModuleStore tests to pull the course_id from the locator
Chris Dodge
committed
52928d1
fix errant conflict resolution
Chris Dodge
committed
7bdc4c5
fix broken test after rebase
Chris Dodge
committed
7a80a9c
fix one more 'revision' -> 'branch' argument name change
Chris Dodge
committed
9cc796d
fix bad merge conflict resolution
Chris Dodge
committed
5ee5bea
forgot to return dictionary on get_errored_courses
Chris Dodge
committed
0b8866e
change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration
Chris Dodge
committed
6121916
resolve incorrect merge conflict resolution
Chris Dodge
committed
c6cde6a
fix pep8 violations
Chris Dodge
committed
ed584a9
fix pylint violations
Chris Dodge
committed
cf715cb
add unit tests for all methods in MixedModuleStore
Chris Dodge
committed
bca2018
add test for test_static_url_generation_from_courseid
Chris Dodge
committed
ae6f97a
add a filter to get_courses to not surface any courses that haven't been mapped, unless the store provider has been labeled as 'default'
Chris Dodge
committed
13ff461
have the test teardown explicitly call destroy_db
Chris Dodge
committed
d1ce55f
add changelog entry
Chris Dodge
committed
1128f36
add unit test for video_caption asset path
Chris Dodge
committed
bd71a2c

Navigation Menu

Uh oh!

Feature/cdodge/add a mixed modulestore - #722

Feature/cdodge/add a mixed modulestore#722
chrisndodge merged 27 commits into
masterfrom
feature/cdodge/add-a-mixed-modulestore

Commits on Aug 16, 2013

initial commit for a mixed module store which can interoperate with both XML and Mongo module stores

add a set_modulestore_configuration to the modulestore interface. This can be used to pass in settings run the Django tier

WIP: added a get_modulestore_type. Added some unit tests. changed over the isinstance() with respect to modulestores to use this get_modulestore_type()

remove unneeded type check on the modulestore

WIP

fix tests

remove debugging logging

remove another debug logging message

update file comment on MixedModuleStore

fix missed conflict resolution

some additional comments to clarify the partially bogus course_id.

update SplitModuleStore tests to pull the course_id from the locator

fix errant conflict resolution

fix broken test after rebase

fix one more 'revision' -> 'branch' argument name change

fix bad merge conflict resolution

forgot to return dictionary on get_errored_courses

change over the modulestore configuration to be a dict and use a property accessor. Also update some django-admin configs to use this means to set the runtime configuration

resolve incorrect merge conflict resolution

fix pep8 violations

fix pylint violations

add unit tests for all methods in MixedModuleStore

add test for test_static_url_generation_from_courseid

add a filter to get_courses to not surface any courses that haven't been mapped, unless the store provider has been labeled as 'default'

have the test teardown explicitly call destroy_db

add changelog entry

add unit test for video_caption asset path