Conflicts: cms/djangoapps/contentstore/tests/test_contentstore.py cms/djangoapps/contentstore/views.py cms/templates/edit_subsection.html cms/templates/overview.html cms/templates/unit.html cms/templates/widgets/header.html common/djangoapps/course_groups/tests/tests.py common/lib/xmodule/setup.py common/lib/xmodule/xmodule/capa_module.py common/lib/xmodule/xmodule/combined_open_ended_module.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/js/src/.gitignore common/lib/xmodule/xmodule/mako_module.py common/lib/xmodule/xmodule/modulestore/mongo.py common/lib/xmodule/xmodule/modulestore/store_utilities.py common/lib/xmodule/xmodule/modulestore/xml_exporter.py common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py common/lib/xmodule/xmodule/peer_grading_module.py common/lib/xmodule/xmodule/tests/__init__.py common/lib/xmodule/xmodule/tests/test_capa_module.py common/lib/xmodule/xmodule/tests/test_self_assessment.py common/lib/xmodule/xmodule/x_module.py lms/djangoapps/courseware/grades.py lms/djangoapps/courseware/models.py lms/djangoapps/courseware/views.py lms/djangoapps/open_ended_grading/tests.py
28 lines
939 B
Python
28 lines
939 B
Python
import datetime
|
|
|
|
from xblock.core import Namespace, Boolean, Scope, ModelType, String
|
|
|
|
|
|
class StringyBoolean(Boolean):
|
|
def from_json(self, value):
|
|
if isinstance(value, basestring):
|
|
return value.lower() == 'true'
|
|
return value
|
|
|
|
class DateTuple(ModelType):
|
|
"""
|
|
ModelType that stores datetime objects as time tuples
|
|
"""
|
|
def from_json(self, value):
|
|
return datetime.datetime(*value[0:6])
|
|
|
|
def to_json(self, value):
|
|
return list(value.timetuple())
|
|
|
|
|
|
class CmsNamespace(Namespace):
|
|
is_draft = Boolean(help="Whether this module is a draft", default=False, scope=Scope.settings)
|
|
published_date = DateTuple(help="Date when the module was published", scope=Scope.settings)
|
|
published_by = String(help="Id of the user who published this module", scope=Scope.settings)
|
|
empty = StringyBoolean(help="Whether this is an empty template", scope=Scope.settings, default=False)
|