-> 
+ # For example, what I'm seeing is ->
# Note the dropped element closing tag. This causes the LMS to fail when rendering modules - that's
# no good, so we have to do this kludge
- if isinstance(module_data, str) or isinstance(module_data, unicode): # some module 'data' fields are non strings which blows up the link traversal code
- lxml_rewrite_links(module_data, lambda link: verify_content_links(module, course_data_path,
- static_content_store, link, remap_dict))
+ if isinstance(module.data, str) or isinstance(module.data, unicode): # some module 'data' fields are non strings which blows up the link traversal code
+ lxml_rewrite_links(module.data, lambda link: verify_content_links(module, course_data_path,
+ static_content_store, link, remap_dict))
for key in remap_dict.keys():
- module_data = module_data.replace(key, remap_dict[key])
+ module.data = module.data.replace(key, remap_dict[key])
- except Exception, e:
+ except Exception:
logging.exception("failed to rewrite links on {0}. Continuing...".format(module.location))
- store.update_item(module.location, module_data)
+ store.update_item(module.location, module.data)
- if 'children' in module.definition:
- store.update_children(module.location, module.definition['children'])
+ if module.has_children:
+ store.update_children(module.location, module.children)
- # NOTE: It's important to use own_metadata here to avoid writing
- # inherited metadata everywhere.
- store.update_metadata(module.location, dict(module.own_metadata))
+ metadata = {}
+ for field in module.fields + module.lms.fields:
+ # Only save metadata that wasn't inherited
+ if (field.scope == Scope.settings and
+ field.name in module._inherited_metadata and
+ field.name in module._model_data):
+
+ metadata[field.name] = module._model_data[field.name]
+ store.update_metadata(module.location, metadata)
return module_store, course_items
diff --git a/common/lib/xmodule/xmodule/runtime.py b/common/lib/xmodule/xmodule/runtime.py
index 8be4bfe346..7030f04f9f 100644
--- a/common/lib/xmodule/xmodule/runtime.py
+++ b/common/lib/xmodule/xmodule/runtime.py
@@ -33,19 +33,33 @@ class DbModel(MutableMapping):
def __repr__(self):
return "<{0.__class__.__name__} {0._module_cls!r}>".format(self)
- def __str__(self):
- return str(dict(self.iteritems()))
-
def _getfield(self, name):
- if (not hasattr(self._module_cls, name) or
- not isinstance(getattr(self._module_cls, name), ModelType)):
+ # First, get the field from the class, if defined
+ module_field = getattr(self._module_cls, name, None)
+ if module_field is not None and isinstance(module_field, ModelType):
+ return module_field
- raise KeyError(name)
+ # If the class doesn't have the field, and it also
+ # doesn't have any namespaces, then the the name isn't a field
+ # so KeyError
+ if not hasattr(self._module_cls, 'namespaces'):
+ return KeyError(name)
- return getattr(self._module_cls, name)
+ # Resolve the field name in the first namespace where it's
+ # available
+ for namespace_name in self._module_cls.namespaces:
+ namespace = getattr(self._module_cls, namespace_name)
+ namespace_field = getattr(type(namespace), name, None)
+ if namespace_field is not None and isinstance(module_field, ModelType):
+ return namespace_field
+
+ # Not in the class or in any of the namespaces, so name
+ # really doesn't name a field
+ raise KeyError(name)
def _key(self, name):
field = self._getfield(name)
+ print name, field
module = field.scope.module
if module == ModuleScope.ALL:
@@ -88,5 +102,5 @@ class DbModel(MutableMapping):
def keys(self):
fields = [field.name for field in self._module_cls.fields]
for namespace_name in self._module_cls.namespaces:
- fields.extend(field.name for field in getattr(self._module_cls, namespace_name))
+ fields.extend(field.name for field in getattr(self._module_cls, namespace_name).fields)
return fields
diff --git a/common/lib/xmodule/xmodule/self_assessment_module.py b/common/lib/xmodule/xmodule/self_assessment_module.py
index 2edf5467b2..2f4674cf7c 100644
--- a/common/lib/xmodule/xmodule/self_assessment_module.py
+++ b/common/lib/xmodule/xmodule/self_assessment_module.py
@@ -25,6 +25,7 @@ from .stringify import stringify_children
from .x_module import XModule
from .xml_module import XmlDescriptor
from xmodule.modulestore import Location
+from .model import List, String, Scope, Int
log = logging.getLogger("mitx.courseware")
@@ -61,67 +62,21 @@ class SelfAssessmentModule(XModule):
js = {'coffee': [resource_string(__name__, 'js/src/selfassessment/display.coffee')]}
js_module_name = "SelfAssessment"
- def __init__(self, system, location, definition, descriptor,
- instance_state=None, shared_state=None, **kwargs):
- XModule.__init__(self, system, location, definition, descriptor,
- instance_state, shared_state, **kwargs)
+ student_answers = List(scope=Scope.student_state, default=[])
+ scores = List(scope=Scope.student_state, default=[])
+ hints = List(scope=Scope.student_state, default=[])
+ state = String(scope=Scope.student_state, default=INITIAL)
- """
- Definition file should have 4 blocks -- prompt, rubric, submitmessage, hintprompt,
- and two optional attributes:
- attempts, which should be an integer that defaults to 1.
- If it's > 1, the student will be able to re-submit after they see
- the rubric.
- max_score, which should be an integer that defaults to 1.
- It defines the maximum number of points a student can get. Assumed to be integer scale
- from 0 to max_score, with an interval of 1.
+ # Used for progress / grading. Currently get credit just for
+ # completion (doesn't matter if you self-assessed correct/incorrect).
+ max_score = Int(scope=Scope.settings, default=MAX_SCORE)
- Note: all the submissions are stored.
-
- Sample file:
-
- ${field | h}
-%endfor
+${field | h}
+ ${field | h}
+