Chris Dodge
8ece663284
more drive by violation fixes
2013-04-12 15:45:27 -04:00
Calen Pennington
92e99d7a8b
Move field definitions for XModules into mixin classes, so that descriptors and modules always have the same set of fields
2013-03-13 11:35:50 -04:00
Calen Pennington
4f555f6480
Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model
...
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/module_info_model.py
cms/djangoapps/contentstore/tests/factories.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_details.py
cms/djangoapps/models/settings/course_grading.py
cms/templates/edit_subsection.html
common/djangoapps/mitxmako/shortcuts.py
common/djangoapps/static_replace.py
common/djangoapps/util/converters.py
common/djangoapps/xmodule_modifiers.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/abtest_module.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/discussion_module.py
common/lib/xmodule/xmodule/error_module.py
common/lib/xmodule/xmodule/html_module.py
common/lib/xmodule/xmodule/js/src/video/display.coffee
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.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/raw_module.py
common/lib/xmodule/xmodule/self_assessment_module.py
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_export.py
common/lib/xmodule/xmodule/tests/test_import.py
common/lib/xmodule/xmodule/video_module.py
common/lib/xmodule/xmodule/x_module.py
common/lib/xmodule/xmodule/xml_module.py
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/courses.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/djangoapps/django_comment_client/utils.py
lms/templates/staff_problem_info.html
lms/templates/video.html
rakefile
2013-02-07 15:12:30 -05:00
Calen Pennington
789ac3fc87
Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api
2013-01-04 16:19:58 -05:00
Calen Pennington
6427dd6742
WIP: Get the cms running. Component previews work
2013-01-02 09:07:02 -05:00
Calen Pennington
d61c91c139
Fix errors around error descriptors and custom tag modules
2012-12-28 14:53:30 -05:00
Calen Pennington
01411ae66e
WIP: Trying to get tests working
2012-12-28 14:48:47 -05:00
Calen Pennington
8ba4163557
WIP. Data loads, but not all of it
2012-12-28 14:39:13 -05:00
Brian Wilson
4ebd70dcc4
add support for utf8 in sequences, verticals and custom modules.
2012-12-04 03:54:36 -05:00
Calen Pennington
5e0f0be1be
Fix up ErrorDescriptor._construct, and use in in ErrorDescriptor.from_json
2012-09-25 10:10:44 -04:00
Calen Pennington
bf4ae6b7e6
Load modules from the mongo modulestore as errordescriptors if creating a regular descriptor fails, but leave the location the same
2012-09-25 10:10:44 -04:00
Calen Pennington
3107bb9c45
Make separate json and xml editing interfaces
2012-09-25 10:10:44 -04:00
Calen Pennington
e9358f0e4e
Make ErrorDescriptor continue to use the interface for __init__ that XModuleDescriptor uses, while providing a helper function for constructing from a different set of arguments
2012-09-25 10:10:44 -04:00
Calen Pennington
b69edcd869
Pass org and course through ErrorDescriptor.from_xml to ErrorDescriptor.__init__
2012-09-25 10:10:44 -04:00
Calen Pennington
d8736914d4
Display an error descriptor for a preview when a descriptor can be loaded but a module can't
2012-09-25 10:10:44 -04:00
Victor Shnayder
365495521e
Catch errors in module load
...
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
2012-08-22 12:58:46 -04:00
Victor Shnayder
b782e2ff5d
Make start dates work for all modules
...
* error modules now hidden via access control
* get_module() returns None if user doesn't have access
2012-08-14 23:30:37 -04:00
Victor Shnayder
3455f8f64d
Hide errors from non-staff users
2012-08-12 18:03:12 -04:00
Victor Shnayder
5523c2883e
Generate error module url_names using sha1
...
* means we get the same url_name on each import of the same data.
2012-08-07 11:06:47 -04:00
Victor Shnayder
79e0bc25f8
Make url_names on error descriptors unique
2012-08-07 11:06:47 -04:00
Victor Shnayder
fc0f938eae
Responding to comments on pull #326
...
* cleaned up error module:
- only one template
- save error message in xml and reload
* better display of problem definition and metadata to staff
* save error messages as string, not exception objects.
2012-08-02 09:56:01 -04:00
Victor Shnayder
0b67d1c401
Turn error_handlers into error_trackers
...
* simplify logic--tracker just tracks errors. Trackers should not raise,
and are not be responsible for logging.
* adapted code to use trackers.
* Started cleanup of error handling code:
- if need to add info and re-raise, just do that. No logging.
- if working around a problem, log and track as needed.
2012-08-01 11:48:18 -04:00
Victor Shnayder
c0cdff7071
Rename MalformedDescriptor to ErrorDescriptor
...
* change references and tests
* add staff/non-staff display
* added is_staff to ModuleSystem
2012-08-01 11:42:39 -04:00
