Commit Graph

15 Commits

Author SHA1 Message Date
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Don Mitchell
bd2dd9408d Unit tests and minor fixes to course_info_updates. Main fix was
returning the content in same form as it was saved rather than parroting
it back.
2013-03-20 17:49:03 -04:00
Calen Pennington
2bc3000156 Fix tests 2013-02-15 15:44:11 -05: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
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Don Mitchell
83b7997d12 Added unit tests and generalized a catch 2013-01-08 16:43:42 -05:00
Don Mitchell
1708dc4080 Use html rather than xml parsing for course updates 2013-01-08 15:13:37 -05:00
Calen Pennington
4bec871b0f Don't return BadRequest classes, return instances 2013-01-02 15:07:12 -05:00
Calen Pennington
8e0d218c7d Stop using .definition and .metadata directly 2013-01-02 15:06:43 -05:00
Don Mitchell
683535d913 Another bug for when the content for an update is more than one element. 2012-12-20 11:09:10 -05:00
Don Mitchell
b5fd6c9012 Send back error to client if failed to save malformed update and have it
show an alert.
2012-12-18 15:22:07 -05:00
Don Mitchell
0192a04b20 Fixed course_info parsing bug.
Addressed some of Christina's review comments.
2012-12-18 14:28:53 -05:00
Don Mitchell
521fa938b3 Fixed course info bug (and simplified parsing). Incidentally fixed 2
other course info bugs (not editing/deleting right element if > 10,
putting new elements at end rather than beginning of list).
Made Location more robust against parsing errors.
2012-12-15 15:56:51 -05:00
Don Mitchell
d943f44f10 Append screw up (naive python goof) 2012-11-30 10:41:10 -05:00
Don Mitchell
0b7bff4c3f Everything tested and ready for Tom to fix 2012-11-30 10:40:19 -05:00