diff --git a/common/djangoapps/xmodule_modifiers.py b/common/djangoapps/xmodule_modifiers.py index 30098c94fc..7e6220f121 100644 --- a/common/djangoapps/xmodule_modifiers.py +++ b/common/djangoapps/xmodule_modifiers.py @@ -106,20 +106,6 @@ def add_histogram(get_html, module, user): histogram = grade_histogram(module_id) render_histogram = len(histogram) > 0 - # TODO (ichuang): Remove after fall 2012 LMS migration done - if settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'): - [filepath, filename] = module.lms.filename - osfs = module.system.filestore - if filename is not None and osfs.exists(filename): - # if original, unmangled filename exists then use it (github - # doesn't like symlinks) - filepath = filename - data_dir = osfs.root_path.rsplit('/')[-1] - edit_link = "%s/%s/tree/master/%s" % (module.lms.giturl, data_dir, filepath) - else: - edit_link = False - # Need to define all the variables that are about to be used - data_dir = "" source_file = module.lms.source_file # source used to generate the problem XML, eg latex or word # useful to indicate to staff if problem has been released or not @@ -135,11 +121,9 @@ def add_histogram(get_html, module, user): 'location': module.location, 'xqa_key': module.lms.xqa_key, 'source_file' : source_file, - 'source_url': '%s/%s/tree/master/%s' % (module.lms.giturl, data_dir, source_file), 'category': str(module.__class__.__name__), # Template uses element_id in js function names, so can't allow dashes 'element_id': module.location.html_id().replace('-','_'), - 'edit_link': edit_link, 'user': user, 'xqa_server' : settings.MITX_FEATURES.get('USE_XQA_SERVER','http://xqa:server@content-qa.mitx.mit.edu/xqa'), 'histogram': json.dumps(histogram), diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py index a7c1087db7..e50adeb364 100644 --- a/common/lib/xmodule/xmodule/xml_module.py +++ b/common/lib/xmodule/xmodule/xml_module.py @@ -230,10 +230,6 @@ class XmlDescriptor(XModuleDescriptor): if definition_metadata: definition['definition_metadata'] = definition_metadata - # TODO (ichuang): remove this after migration - # for Fall 2012 LMS migration: keep filename (and unmangled filename) - definition['filename'] = [ filepath, filename ] - return definition, children @classmethod diff --git a/lms/templates/courseware/xqa_interface.html b/lms/templates/courseware/xqa_interface.html index 73f7cc6f52..b58ad56381 100644 --- a/lms/templates/courseware/xqa_interface.html +++ b/lms/templates/courseware/xqa_interface.html @@ -21,8 +21,6 @@ function sendlog(element_id, edit_link, staff_context){ entry: $('#' + element_id + '_xqa_entry').val() }; - if (edit_link) xqaLog["giturl"] = edit_link; - $.ajax({ url: '${xqa_server}/log', type: 'GET', diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html index 4fee7c22fb..b858e727b8 100644 --- a/lms/templates/staff_problem_info.html +++ b/lms/templates/staff_problem_info.html @@ -42,10 +42,6 @@ ${module_content}
is_released = ${is_released} location = ${location | h} -github = ${edit_link | h} -%if source_file: -source_url = ${source_file | h} -%endif %for name, field in fields: diff --git a/lms/xmodule_namespace.py b/lms/xmodule_namespace.py index 14a19c6714..5fd2c18bb7 100644 --- a/lms/xmodule_namespace.py +++ b/lms/xmodule_namespace.py @@ -34,9 +34,7 @@ class LmsNamespace(Namespace): ) start = Date(help="Start time when this module is visible", scope=Scope.settings) due = String(help="Date that this problem is due by", scope=Scope.settings, default='') - filename = List(help="DO NOT USE", scope=Scope.content, default=['', None]) source_file = String(help="DO NOT USE", scope=Scope.settings) - giturl = String(help="DO NOT USE", scope=Scope.settings, default='https://github.com/MITx') xqa_key = String(help="DO NOT USE", scope=Scope.settings) ispublic = Boolean(help="Whether this course is open to the public, or only to admins", scope=Scope.settings) graceperiod = Timedelta(help="Amount of time after the due date that submissions will be accepted", scope=Scope.settings)
Module Fields