105 Commits

Author	SHA1	Message	Date
ichuang	aedcd9a4c4	change "type" to "category" in xml_module.py	2012-07-08 22:04:54 -04:00
ichuang	0daf7b0497	merging of stable-edx4edx into master - bugfixes and debugging	2012-07-08 19:03:29 -04:00
ichuang	9b90068e03	Merge branch 'stable-edx4edx' of github.com:MITx/mitx ... Conflicts: common/lib/xmodule/seq_module.py common/lib/xmodule/xmodule/capa_module.py lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/views.py lms/djangoapps/multicourse/multicourse_settings.py	2012-07-08 16:52:36 -04:00
ichuang	96c132b333	put try around Progress call in capa_module - exception when divide by zero	2012-07-03 17:02:01 -04:00
Calen Pennington	207777fbe1	Fix up problem display to use the new metadata that's available	2012-07-03 14:20:11 -04:00
Calen Pennington	42cef5b788	Get rid of references to self.filename in capa_module, as it no longer exists	2012-07-03 14:19:51 -04:00
Calen Pennington	68c155b268	Don't use __dict__ for namedtuples, because it doesn't work in python 2.7.1	2012-07-03 09:57:51 -04:00
Calen Pennington	64a4a62cf5	Don't pass fileobjects to LoncapaProblem	2012-07-02 20:01:20 -04:00
Calen Pennington	3355f804d1	Add logging of filename when module file parsing fails	2012-07-02 20:01:01 -04:00
Calen Pennington	e172be3a26	Make XML import pass in an empty render_template function	2012-07-02 19:55:42 -04:00
Calen Pennington	3b4fb61648	Push dependency on mitxmako up out of mako_module	2012-07-02 14:10:29 -04:00
Calen Pennington	e56f8763ac	Point to the js files in package data	2012-07-02 13:26:14 -04:00
Calen Pennington	a0f550396c	Make xmodule fit the typical python installation setup	2012-07-02 13:19:27 -04:00
Calen Pennington	cc8ecb1891	Make xmodule tests pass again	2012-07-02 12:50:03 -04:00
Calen Pennington	8f59521660	Add a function to check round-trip export/import cycles	2012-07-02 12:25:48 -04:00
Calen Pennington	be40d8bb69	Make sure that xml_module definition xml doesn't have any metadata sprinkled in with it	2012-07-02 12:25:09 -04:00
Calen Pennington	c57833dab7	Define equality for XModuleDescriptors	2012-07-02 12:24:39 -04:00
Calen Pennington	f035d5602d	Keep abtest children in a consistent order (makes testing easier)	2012-07-02 12:24:07 -04:00
Calen Pennington	3a348e5713	Adjust xml export code for the type -> category conversion	2012-07-02 11:25:42 -04:00
Calen Pennington	d7dbced8e6	Store the top level course in the XMLModuleStore (since there is only one course per module store	2012-07-02 11:25:21 -04:00
Calen Pennington	85f294b3e3	Allow for no default_class in XMLModuleStore	2012-07-02 11:21:40 -04:00
Calen Pennington	6612beab46	Acknowledge the fact that right now keystore is really just a module store. If we need a keystore that returns other objects, we can reexctract the base class into it's own module again	2012-07-02 11:15:37 -04:00
Calen Pennington	8cf848b191	Handle the filename for capa_module in the xml_module code, rather than specially in capa_module	2012-07-02 10:51:01 -04:00
Calen Pennington	552c199795	Export large xml as separate files. Note: inherited metadata is creeping into child nodes	2012-07-02 10:51:01 -04:00
Calen Pennington	bacce3e656	Load module contents from the file specified by the filename attribute	2012-07-02 10:51:01 -04:00
Calen Pennington	79987666df	Lazily load module definition and metadata as needed, rather than immediately	2012-07-02 10:50:27 -04:00
Calen Pennington	d95be5aa24	Fix html rendering after making it a RawDescriptor	2012-07-02 10:49:05 -04:00
Calen Pennington	b9dd30cd58	Don't dump inherited metadata when exporting xml	2012-07-02 10:49:05 -04:00
Calen Pennington	2f95146b9b	Just use the class name when complaining about definition_from_xml not being implemented	2012-07-02 10:49:05 -04:00
Calen Pennington	f375258b38	Add xml export infrastructure for all existing modules	2012-07-02 10:49:05 -04:00
Calen Pennington	a94e4d2f1b	Rearrange x_module definition into sections	2012-07-02 10:49:05 -04:00
Calen Pennington	c6d5eea841	Fix typo	2012-07-02 10:44:50 -04:00
Calen Pennington	ada152758d	Make abtest store group portions as a dictionary	2012-07-02 10:44:50 -04:00
Calen Pennington	5b8c3dc1e4	Make html a RawDescriptor with a slightly different UI	2012-07-02 10:44:50 -04:00
Calen Pennington	f859457037	Cache loaded plugins in memory	2012-07-02 10:35:40 -04:00
Calen Pennington	a7d0e2e122	Use a string key for default groups in abtests (and remove code that was expecting groups from django)	2012-07-02 10:35:40 -04:00
Calen Pennington	3cf29af8fe	Make location into a named tuple, and use it more as a first class entity, rather than URL for identifying content	2012-07-02 10:17:59 -04:00
Calen Pennington	736148f21d	Adding clarifying comment about the contents of 'data'	2012-07-02 09:02:41 -04:00
Calen Pennington	7ac8fecb38	Rename XModule[Descriptor].type to .category to be parallel to Location	2012-07-02 09:01:08 -04:00
Calen Pennington	7b78fa5278	Make self.rerandomize a property accessor that reads from metadata	2012-07-02 08:57:05 -04:00
Calen Pennington	4ae711c421	Clarify from_json arguments	2012-07-02 08:54:23 -04:00
Calen Pennington	32ed18fef6	Allow slightly more latitude in what is passed as the children array	2012-07-02 08:54:13 -04:00
Calen Pennington	cff8ae4623	Add more documentation to XModule	2012-07-02 08:50:56 -04:00
Calen Pennington	6686179bb6	Moving __init__ functions in xmodule to top of class for consistancy	2012-07-01 14:15:02 -04:00
Calen Pennington	e61946dfea	Fix titles in sequence module display	2012-07-01 13:52:06 -04:00
Calen Pennington	f25478b3d4	Consolidate access to metadata, and allow some of it to be inherited between modules	2012-06-29 12:45:46 -04:00
Calen Pennington	dcd74e6dd0	Make abtests work, using the new abtest xml format	2012-06-29 12:45:18 -04:00
Calen Pennington	c3a432f217	Make problemsets display as verticals rather than sequences	2012-06-29 12:45:18 -04:00
Calen Pennington	27b75ca76e	Use display_name in sequence title bar	2012-06-29 12:45:18 -04:00
Calen Pennington	35af8101d7	Make grade graph on profile work correctly	2012-06-29 12:45:18 -04:00