Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1864 Commits

Author SHA1 Message Date
Victor Shnayder
ea26c25cb4 add back-compat code to customtag 
* apparently 6002x is using the impl-as-child structure already.
 2012-08-01 16:33:28 -04:00
Rocky Duan
777c3ee42c Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/profile.html
 2012-08-01 12:49:00 -04:00
Victor Shnayder
7fb831a2e8 Record warning on bad html files 2012-08-01 11:48:19 -04:00
Victor Shnayder
05c22c4901 Prettier error display 
* Log formatted traceback string instead of exc_info tuple itself
* display as a list
 2012-08-01 11:48:19 -04:00
Victor Shnayder
32253510d1 Import error cleanup 
* call error tracker when needed
* remove duplicate logging--just add info and re-raise
* xml modulestore uses error tracker to capture load errors
* add unstyled list of import errors to courseware homepage!
 2012-08-01 11:48:19 -04:00
Victor Shnayder
740c9b7df1 fixed docstring for customtag 2012-08-01 11:48:18 -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
009bd23066 save LazyLoadingDict in case we do want it later 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
Victor Shnayder
707551b08d local variable naming tweak 2012-08-01 11:40:12 -04:00
Victor Shnayder
0edc40de34 Address minor comments in #313 2012-08-01 11:40:12 -04:00
Victor Shnayder
0ae434cc09 Move path_to_location out of mongo.py 
* also bugfix for load_definition in html_module
* a bit of refactoring of Location checking code in mongo.py
 2012-08-01 11:40:12 -04:00
Victor Shnayder
ed35cefa29 Fix html file handling. 
* html files are now stored as follows:

If the html file is valid xml, store as html/stuff.xml

If it's not, store as html/stuff.xml, which contains
<html meta1="..."  filename="stuff.html">,
and html/stuff.html, which actually contains the contents.
Warn if the contents are not parseable with lxml's html parser,
but don't error.

* for parseable html, strip out the html tag when storing, so that it isn't
  rendered into the middle of a page

* lots of backcompat to deal with paths.  Can go away soon.

* fix output ordering in clean_xml
 2012-08-01 11:40:12 -04:00
Victor Shnayder
d750d945fd Remove malformed tags when contents aren't malformed anymore. 2012-08-01 11:40:12 -04:00
Victor Shnayder
0d83d2e645 Add roundtrip test for malformed module 
* also fix error message in backcompat_module
 2012-08-01 11:40:11 -04:00
Victor Shnayder
53608922ba Make the malformed descriptor import properly 
* Also get rid of lazy loading of metadata and definition
 2012-08-01 11:40:11 -04:00
Victor Shnayder
ef6da22ac3 Add a fallback MalformedDescriptor 
* when things don't load normally, use this
* separate raw editing functionality into EditingDescriptor
* raw descriptor just enforces that xml is valid
* add a MalformedDescriptor that just saves a string
* Fallback to it on import.
 2012-08-01 11:40:11 -04:00
Victor Shnayder
4e6a9b0df7 Add kwargs back to DescriptorSystem init()s 
* allow future expansion without breaking interface.
 2012-08-01 11:40:11 -04:00
Calen Pennington
ef8a211b9e Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading 
Got profile page working again.
 2012-08-01 08:37:16 -07:00
Bridger Maxwell
ae3da772d0 Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json. 2012-08-01 11:27:04 -04:00
Brittany Cheng
f637ca5120 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-08-01 09:44:45 -04:00
ichuang
b9773b5d17 Merge pull request #323 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-31 19:45:55 -07:00
Brittany Cheng
f1e07024d4 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 18:43:21 -04:00
Kyle Fiedler
d30ae5389e Added fix for videos start to zero out colors and mit styles 2012-07-31 14:18:42 -04:00
kimth
2e3c5de1a5 Remove hardcoding of LMS callback URL and default queuename 2012-07-31 14:08:02 -04:00
Rocky Duan
c39b2db678 retrieve inline discussion by ajax 2012-07-31 13:22:25 -04:00
Rocky Duan
ada66adff6 Merge branch 'master' of github.com:MITx/mitx 2012-07-31 10:12:06 -04:00
ichuang
94e73936fc Merge pull request #319 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-07-30 18:51:16 -07:00
kimth
6d600ecf2c Merge branch 'master' into kimth/lms-coderesponse 2012-07-30 20:42:10 -04:00
Rocky Duan
8228bebc2a Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py
 2012-07-30 17:41:19 -04:00
Calen Pennington
ab0055c201 Add update_schematic to window in schematic.js 2012-07-30 14:04:39 -04:00
Calen Pennington
395cf147be Look up data_dir in the metadata, not in the top of the json object when loading from mongodb 2012-07-30 14:04:39 -04:00
Calen Pennington
2caf1024f1 Force mongodb fs_root to be a path object 2012-07-30 14:04:15 -04:00
Calen Pennington
d0c99151f0 Continue during backcompat imports by replacing contents with error xml 2012-07-30 14:04:15 -04:00
Calen Pennington
66d5c8effd Add more detail to error messages during loading from xml 2012-07-30 13:50:50 -04:00
Calen Pennington
6997fc579e Continue on errors when syncing with github 2012-07-30 13:50:00 -04:00
kimth
bd0b20bb60 xqueue_callback uses 'xqueue_body' tag rather than 'response' tag for main message 2012-07-30 13:35:13 -04:00
Calen Pennington
05add5818b Return a custom error for duplicate elements, and ignore it when loading into mongo 2012-07-30 13:16:21 -04:00
Rocky Duan
1ad838ace8 fix random js stuff; tag fields; override mathjax config for now 2012-07-28 18:15:37 -04:00
Victor Shnayder
59defd33b6 Formatting and little bugfixes 
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
 2012-07-27 16:09:25 -04:00
Victor Shnayder
a8afe5ed17 Change modulestore to use a logging error handler 
* log errors, but don't fail
 2012-07-27 16:09:25 -04:00
Victor Shnayder
73b3826820 Initial integration tests! 
* new env file to run integration tests with mongo backend
  - needs askbot to get db in the right state
  - needs wiki to load pages successfully
  - not using migrations to make it run faster
* import test courses, check that each page loads without erroring.
* fix NonePointerException in index view to make tests pass
* misc formatting cleanups
 2012-07-27 16:09:25 -04:00
Victor Shnayder
1251686359 xml format cleanups 
* rename slug->url_name
* rename name->display_name
* docstring cleanups
* comments :)
 2012-07-27 16:09:25 -04:00
Victor Shnayder
3c3bbd114e minor formatting tweaks 2012-07-27 16:08:24 -04:00
Victor Shnayder
da29d88d04 Add import-export round-trip check. 
* add fix for the file export code--remove tag tail and text,
  not just the children.
 2012-07-27 16:08:24 -04:00
Victor Shnayder
128d11e20e line length fixes 2012-07-27 16:08:24 -04:00
Victor Shnayder
168f76ce5a Add jump_to functionality to lms on mongo 
* More tests for mongo modulestore, including tweaks to test files
* add location_to_id method to CourseDescriptors
* Implement path_to_location method in mongo.py
  - TODO: does not handle position in sequences yet.
* fix bug in jump_to view.
 2012-07-27 16:08:24 -04:00
Victor Shnayder
eb5989aa99 Ready to implement path_to_location 
* Clean up test data for simple, toy courses
* clean up test_mongo.py
* write initial test for path_to_location
* hook up view to use path_to_location

Next: actually implement it :)
 2012-07-27 16:08:24 -04:00
Victor Shnayder
f10c4c06b6 Start adding tests for mongo modulestore 
* fix up toy course to match current format
* fix github sync test that referred to toy course
 2012-07-27 16:08:23 -04:00
Victor Shnayder
60cba3d95f Move import_from_xml to xmodule/modulestore 2012-07-27 16:08:23 -04:00