Calen Pennington
3b4fb61648
Push dependency on mitxmako up out of mako_module
2012-07-02 14:10:29 -04:00
ichuang
1509cdcced
Merge pull request #153 from MITx/cpennington/lms-descriptors
...
These changes make the LMS read from the XML course files using the ModuleStore interface.
Note that stable-edx4edx will now no longer be a clean merge. But this code has priority.
2012-07-02 10:52:22 -07:00
Calen Pennington
d7178e4a41
Add a set of rake tasks for checking settings importability
2012-07-02 13:26:31 -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
ichuang
63aa451d67
use course = settings.COURSE_DEFAULT.replace('_',' ') for default accordion
2012-07-02 11:29:45 -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
ichuang
10a10c7938
clean up email settings check in lms.djangoapps.student.views
2012-07-02 11:21:00 -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
9c715b60a6
Fix broken element ids for modules with .s in their names
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
1d4e1d55d5
Enforce location uniqueness in xml keystore
2012-07-02 10:49:05 -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
1e8acbefac
Add a temporary url for testing xml export triggering
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
b7062ca5ca
Only set the xml slug if it isn't already set
2012-07-02 10:44:30 -04:00
Calen Pennington
8a64029b07
Remove blank text nodes during xml parsing
2012-07-02 10:44:30 -04:00
Calen Pennington
7b89b1eb54
Add ability to update modulestore metadata for a module separately from data or children
2012-07-02 10:44:30 -04:00
Calen Pennington
51a790173f
Only set the default etree parser options in the module that is starting the xml parsing
2012-07-02 10:35:40 -04:00
Calen Pennington
f859457037
Cache loaded plugins in memory
2012-07-02 10:35:40 -04:00
Calen Pennington
520fac1aa2
Enforce an index over the location key in mongo
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
b5cd01841c
Merge remote-tracking branch 'origin/master' into cpennington/lms-descriptors
...
Conflicts:
lms/djangoapps/courseware/grades.py
2012-07-02 10:31:26 -04:00
Calen Pennington
312dda760e
Fixing repr for Locations
2012-07-02 10:25:25 -04:00
Calen Pennington
e0e42ae8ac
Fix up cms after changing html and sequence descriptors to use metadata
2012-07-02 10:18:24 -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
7ed9b4aa89
Add hashing and equality methods to Location
2012-07-02 09:08:24 -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
