MIT CCX: Use CCX Keys: further revisions in response to code review
only require ccx-keys once get_current_ccx will now expect a CourseKey instance as its argument, and will raise a value error if this expectation is not met. document reason for local import add special methods to pass attribute setting and deletion through to the wrapped modulestore add __setattr__ and __delattr__ per code review, update __init__ to work with new methods style change per code review clean up context manager usage as recommended by code review remove unused code and imports convert modulestore type tests to use the `get_modulestore_type` api, remove unused imports code quality: add docstrings increase coverage for utils tests fix bug found in testing. increase test coverage on modulestore wrapper code quality fixes code-quality: ignore import error, but mark site for future consideration
This commit is contained in:
@@ -41,9 +41,7 @@ from student.models import CourseEnrollment, UserProfile, Registration
|
||||
import track.views
|
||||
from xmodule.modulestore import ModuleStoreEnum
|
||||
from xmodule.modulestore.django import modulestore
|
||||
from xmodule.modulestore.xml import XMLModuleStore
|
||||
from opaque_keys.edx.locations import SlashSeparatedCourseKey
|
||||
from ccx.modulestore import CCXModulestoreWrapper
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
@@ -60,13 +58,10 @@ class SysadminDashboardView(TemplateView):
|
||||
modulestore_type and return msg
|
||||
"""
|
||||
|
||||
self.def_ms = check_ms = modulestore()
|
||||
# if the modulestore is wrapped by CCX, unwrap it for checking purposes
|
||||
if isinstance(check_ms, CCXModulestoreWrapper):
|
||||
check_ms = check_ms._modulestore
|
||||
self.def_ms = modulestore()
|
||||
|
||||
self.is_using_mongo = True
|
||||
if isinstance(check_ms, XMLModuleStore):
|
||||
if self.def_ms.get_modulestore_type(None) == 'xml':
|
||||
self.is_using_mongo = False
|
||||
self.msg = u''
|
||||
self.datatable = []
|
||||
|
||||
Reference in New Issue
Block a user