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

5216 Commits

Author SHA1 Message Date
Don Mitchell
80f57db7c3 Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf 
Feature/cdodge/course overview perf
 2013-03-29 12:35:41 -07:00
Chris Dodge
599ca4d429 oops. I'm not programming in C# any longer 2013-03-29 15:31:37 -04:00
Ned Batchelder
0cfcd183b2 No need to wrap comments that tightly. 2013-03-29 15:05:22 -04:00
Ned Batchelder
e8f8e9e197 Enough is enough. 2013-03-29 14:49:24 -04:00
Chris Dodge
3ce01882bb add an 'allowed' list of metadata (e.g. display_name, etc.) and also restrict metadata on sequentials 2013-03-29 13:59:59 -04:00
Diana Huang
17adc986bd Remove the default and prevent input_state from keeping around 
unnecessary data.
 2013-03-29 12:16:27 -04:00
Will Daly
4f9d18df8c Wrote unit tests to verify bug fix in 
https://github.com/MITx/mitx/pull/1764
 2013-03-29 12:00:17 -04:00
Vik Paruchuri
d5376e71ff Add in a test for the weight field 2013-03-29 11:46:44 -04:00
Vik Paruchuri
5391cefddc Add in tests to see if max score properly exposed and calculated in combinedopenended 2013-03-29 11:17:35 -04:00
Will Daly
f90dd49556 Fixed bug in parsing of urandom struct so that seed 
is set to an integer (and correctly saved) instead of a tuple.
 2013-03-29 10:18:11 -04:00
Vik Paruchuri
53620d7879 Merge remote-tracking branch 'origin/master' into fix/vik/oe-and-progress 2013-03-29 10:16:00 -04:00
Brian Wilson
39d666cd13 modify AssignmentFormatGrader to act like a SingleSectionGrader on single sections 2013-03-29 01:27:36 -04:00
Chris Dodge
8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 13:27:29 -04:00
Chris Dodge
c55d54b071 also, we don't support metadata on chapters 2013-03-28 13:03:34 -04:00
Don Mitchell
fece937669 Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata 
Fix/cdodge/use request scoped cache for metadata inheritance
 2013-03-28 06:51:20 -07:00
Chris Dodge
c7bafddace DRY things out a bit and share as much code between MongoModuleStore and DraftMongoModuleStore 2013-03-28 09:49:55 -04:00
Chris Dodge
3cdd973af4 get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore 2013-03-28 09:28:19 -04:00
Chris Dodge
6c67ed1f57 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/course-overview-perf 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 09:28:12 -04:00
Chris Dodge
3f52261b5b hmmm. actually, we should only write out to memcache if we've recomputed. Otherwise, a memcache hit will end up writing back to memcache... 2013-03-27 23:18:38 -04:00
Chris Dodge
d448aa1365 remove debug log messages 2013-03-27 23:13:33 -04:00
Chris Dodge
446397b23b remove unused thread.local() 2013-03-27 23:12:00 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
Vik Paruchuri
0c218176d9 Run some code reformatting 2013-03-27 18:40:18 -04:00
Vik Paruchuri
df6d8fd2a3 Fix issues with progress page and open ended grading 2013-03-27 18:20:04 -04:00
Vik Paruchuri
4443afecaf Get rid of max score on open ended modules. Auto-calculate it from the rubric instead. 2013-03-27 18:05:00 -04:00
Will Daly
9c671163fd Added exc_info=True to log.warning 
Changed log.exception to log.warning
 2013-03-27 17:11:02 -04:00
Will Daly
f038237ee9 Changed log.exception to log.warning 2013-03-27 16:34:08 -04:00
Will Daly
df1be87739 * Changed 404 errors to 400 errors 
* Removed duplicate traceback log message
* Now provide string, not Exception, as second tuple item to raise
 2013-03-27 15:20:40 -04:00
Will Daly
99cd3fafdb Added error handling of XModule processing errors to CMS 
Added tests for SchematicResponse error handling
 2013-03-27 14:48:44 -04:00
Will Daly
ac86687fa1 Added exception handling that solves SchematicResponse exceptions 
causing a 500 error.

When XModule raises a ProcessingError during an AJAX request,
this module_render now returns a 404 to further reduce number of 500
responses.
 2013-03-27 14:33:59 -04:00
cahrens
227a5e8266 Delete converters, move unit tests to test_fields, add new additional test cases. 2013-03-27 12:56:06 -04:00
brianhw
a04881ceda Merge pull request #1740 from MITx/fix/vik/peer-image-grading 
Fix/vik/peer image grading
 2013-03-27 09:06:54 -07:00
Vik Paruchuri
7101c76016 comment on rewrite links change 2013-03-27 12:02:32 -04:00
Will Daly
6edee96caf Added "Staff Debug Info" prefix to traceback message. 2013-03-27 11:24:16 -04:00
Will Daly
0f5e8c5f3b pep8 fixes 2013-03-27 11:17:21 -04:00
Will Daly
5bc44e50da Changed error messages to account for NumericalResponse formatting, 
which is the only other response type to use StudentInputError.
 2013-03-27 11:13:31 -04:00
Will Daly
8252ba15df Changed error message for StudentInputError for non-staff to 
a generic message.  Otherwise, the default exception messages
are cryptic for students (e.g. "cannot convert string to float")
 2013-03-27 11:02:30 -04:00
Will Daly
285e3ee1ed Capa response now displays full stack trace on student input error 
if the user is a staff member.
Otherwise, it displays just the exception message.
 2013-03-27 10:49:47 -04:00
Victor Shnayder
8905343f80 Merge pull request #1744 from MITx/fix/diana/image-response-show-answer 
Fix 500 errors for bug #289
 2013-03-27 07:14:38 -07:00
Christina Roberts
d4eca16f04 Merge pull request #1745 from MITx/feature/rocha/fix-advertised-start 
Display advertised date correctly if it is an ISO date
 2013-03-27 06:23:57 -07:00
Chris Dodge
195fd2d1fe optimize the result-set that gets returned from Mongo on metadata inheritence. We just need the fields which are actually inheritable, so no need to return anything else as it gets filtered out during the computation 2013-03-26 23:48:06 -04:00
Chris Dodge
7a23893557 wip 2013-03-26 16:40:28 -04:00
Calen Pennington
e0343342b0 Fix typo during pylint fixes 2013-03-26 16:36:58 -04:00
Calen Pennington
1f11508ac6 Pylint cleanup 2013-03-26 16:30:55 -04:00
Calen Pennington
90553a1b1d Use get_many and set_many to cut down on the number of metadata trees to retrieve, and only retrieve them once per call to _load_items 2013-03-26 16:19:34 -04:00
Carlos Andrés Rocha
84f2cc8af6 Display advertised date correctly if it is an ISO date 2013-03-26 15:08:44 -04:00
Diana Huang
967cf7e6f3 Fix a problem where trying to show image response answers 
was causing 500 errors. Add test to verify that this won't
happen again.
 2013-03-26 14:43:41 -04:00
Will Daly
cd6f92c7e2 Modified log.debug call to use exc_info=True 2013-03-26 14:27:41 -04:00
Will Daly
1b07b85ef2 Removed extra 'pass' statement 2013-03-26 13:43:26 -04:00
Will Daly
47e47303dc Refactored CustomResponse to use the same private 
func to handle all errors related to execution of
python code.

CustomResponse now returns subclasses of Exception
instead of general Exceptions

CustomResponse no longer includes tracebacks
in the exceptions it raises (and shows to students)
 2013-03-26 13:36:27 -04:00