Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,852 Commits 1 Branch 0 Tags
f0850e25a83bd3bfe7eb96446cf0eeb149fdcd5a
Commit Graph

592 Commits

Author SHA1 Message Date
ichuang
ebe6bf4888 remove some unnecessary debugging lines in xmodule_modifiers 2012-08-04 21:10:50 -04:00
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -04:00
ichuang
d50af5765e make university profile pages also use get_courses_by_university 2012-08-04 11:03:54 -04:00
ichuang
3f83904c12 if AUTH_REQUIRE_STAFF_FOR_COURSE then course list = those accessible 2012-08-04 10:19:54 -04:00
ichuang
30922fb449 add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check 2012-08-03 21:39:23 -04:00
ichuang
84ed806f0d start on lms migration path: view for loaded modules, and reload method 2012-08-03 20:20:35 -04:00
Calen Pennington
9b322f68b4 Merge pull request #337 from MITx/feature/victor/use-url-names 
Feature/victor/use url names
 2012-08-03 13:23:31 -07:00
Calen Pennington
b1494da02c Merge pull request #330 from MITx/ExternalAuth 
External auth
 2012-08-03 13:18:55 -07:00
Victor Shnayder
94e24c1626 Leftover name->url_name fixes 2012-08-03 14:45:43 -04:00
Victor Shnayder
b46172da9b Rename module.name and descriptor.name to url_name 
* update templates and code references
* also a display_name property that defaults to cleaned url_name
 2012-08-03 11:36:54 -04:00
Victor Shnayder
2f911fd3b2 add error-handling TODOs to capa_problem 2012-08-02 14:28:44 -04:00
Victor Shnayder
987b9c11a9 Use url_name for chapters and sections in lms views 
* got rid of the hackish conversions between ' ' and '_'
* use url_name and display_name where appropriate
* update templates to match.
 2012-08-02 14:28:44 -04:00
Victor Shnayder
26ae88faac Factor out get_item_error() into a new ModuleStoreBase class 
* may be temporary if we move errors into the items themselves.
 2012-08-02 13:41:54 -04:00
ichuang
a7103ff893 switch to PascalCase, remove unnecessary assignment 2012-08-02 13:39:12 -04:00
ichuang
3eff9ffecd match external_domain as well when retrieving ExternalAuthMap objects 2012-08-02 13:28:52 -04:00
Victor Shnayder
64346d727b todos and comments 2012-08-02 11:33:53 -04:00
Victor Shnayder
fd796478d8 add a handy supertrace script 2012-08-02 11:33:04 -04:00
Victor Shnayder
31b8270cfb remove too-clever lazy dictionary 2012-08-02 10:14:35 -04:00
Victor Shnayder
41eca8a0a5 Move files into xmodule module per comment on #326 
* move html_checker.py
* move stringify.py
* move tests into module
* remove duplicate progress.py
* fix module imports
 2012-08-02 10:13:58 -04:00
ichuang
613c53a710 slight cleanup, no need to import all of django_openid_auth 2012-08-02 10:05:26 -04:00
ichuang
f2a9110bda change model to have external_id and external_domain be unique_together 2012-08-02 09:56:33 -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
ichuang
b2e9d980ff don't overwrite oid_backend 2012-08-02 09:42:26 -04:00
ichuang
23c3c5a652 print -> log.debug, rename function from camel case 2012-08-02 09:37:24 -04:00
ichuang
727e51411f small change so that ssl authenticated user can logout to see main screen 2012-08-02 08:59:02 -04:00
ichuang
4a0d0a08db minor change so that SSL code doesn't interfere with non-nginx instances 2012-08-01 23:37:35 -04:00
ichuang
938871571b Merge branch 'master' of github.com:MITx/mitx into ExternalAuth 2012-08-01 23:01:29 -04:00
ichuang
a759850e3e add SSL / MIT certificates auth; clean up external_auth.views 2012-08-01 22:42:06 -04:00
Victor Shnayder
e2ce54612c remove debugging assert from test 2012-08-01 19:25:47 -04:00
Victor Shnayder
652e2aa24c fix for inheriting metadata bug 
* problem was on import to json--got all the metadata,
  but didn't preserve the _inherited_metadata
* added own_metadata property, use it instead
 2012-08-01 19:25:47 -04:00
Victor Shnayder
82899323e8 Add metadata inherit test 
* also make a placeholder roundtrip export test
 2012-08-01 19:25:47 -04:00
ichuang
7b725a075c external_auth djangoapps files 2012-08-01 17:57:21 -04:00
Kyle Fiedler
cdd37eeb92 Strip down sequence navigaiton and more stripping of the courseware nav 2012-08-01 17:36:10 -04:00
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
ichuang
4874fa51ef remove cruft from student.views 2012-08-01 15:00:27 -04:00
ichuang
10ebcefd54 add openid authentication 2012-08-01 14:59:55 -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
58543bd84b definition and metadata no longer lazy-loaded 
* get rid of dump to json
* formatting
 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
c53ed6a238 remove some debugging messages 2012-08-01 11:40:11 -04:00