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

Beginnings of Backbone views/models.

Browse Source
This commit is contained in:
cahrens
2013-05-09 11:16:12 -04:00
parent 9e1c935b60
commit bfdbcc2f32
11 changed files with 138 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/lib/xmodule/xmodule/mako_module.py
View File

@@ -31,9 +31,13 @@ class MakoModuleDescriptor(XModuleDescriptor):
"""
Return the context to render the mako template with
"""
# TODO: just return a single thing.
[editable_metadata, simplified_metadata] = self.editable_metadata_fields
return {
'module': self,
'editable_metadata_fields': self.editable_metadata_fields
'editable_metadata_fields': editable_metadata,
'json_metadata_data' : simplified_metadata
}
def get_html(self):

11
common/lib/xmodule/xmodule/x_module.py
View File

@@ -626,6 +626,7 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
inherited_metadata = getattr(self, '_inherited_metadata', {})
inheritable_metadata = getattr(self, '_inheritable_metadata', {})
metadata = {}
simple_metadata = {}
for field in self.fields:
if field.scope != Scope.settings or field in self.non_editable_metadata_fields:
@@ -645,9 +646,15 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
'value': value,
'default_value': default_value,
'inheritable': inheritable,
'explicitly_set': explicitly_set }
'explicitly_set': explicitly_set}
return metadata
simple_metadata[field.name] = {'value': field.to_json(value),
'display_name' : field.display_name,
'default_value': field.to_json(default_value),
'inheritable': inheritable,
'explicitly_set': explicitly_set}
return metadata, simple_metadata
class DescriptorSystem(object):