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

Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules

Browse Source
This commit is contained in:
Chris Dodge
2013-04-02 16:12:05 -04:00
parent 1789814ceb d68650b4e8
commit 1d8f9c225b
19 changed files with 3922 additions and 3884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/lib/xmodule/xmodule/modulestore/xml_importer.py
View File

@@ -419,12 +419,12 @@ def remap_namespace(module, target_location_namespace):
return module
def validate_no_non_editable_metadata(module_store, course_id, category, allowed=[]):
def validate_no_non_editable_metadata(module_store, course_id, category, allowed=None):
'''
Assert that there is no metadata within a particular category that we can't support editing
However we always allow display_name and 'xml_attribtues'
However we always allow 'display_name' and 'xml_attribtues'
'''
allowed = allowed + ['xml_attributes', 'display_name']
_allowed = (allowed if allowed is not None else []) + ['xml_attributes', 'display_name']
err_cnt = 0
for module_loc in module_store.modules[course_id]:
@@ -432,7 +432,7 @@ def validate_no_non_editable_metadata(module_store, course_id, category, allowed
if module.location.category == category:
my_metadata = dict(own_metadata(module))
for key in my_metadata.keys():
if key not in allowed:
if key not in _allowed:
err_cnt = err_cnt + 1
print ': found metadata on {0}. Studio will not support editing this piece of metadata, so it is not allowed. Metadata: {1} = {2}'. format(module.location.url(), key, my_metadata[key])