ichuang
b3f00a6725
add default message to conditional
2013-03-31 12:31:05 +00:00
David Ormsbee
24e64e3946
Merge pull request #1773 from MITx/hotfix/dave/mult_choice_display
...
HOTFIX: Accept either a list of possible values, or a string as a value for
I'm pulling this in myself because it's urgent, it's the weekend, and I don't want this to get forgotten.
2013-03-30 08:55:45 -07:00
David Ormsbee
dfd3a699b9
Accept either a list of possible values, or a string as a value for
...
comparison of correctness in multiple choice.
Multiple choice code is scattered and sometimes sends a list of
choices for the value, and sometimes a single string. We used to use
"in" which scarily handled both cases (list or substring search),
but that caused a bug when you had two choices like choice_1 and
choice10. Moving to == caused us to break when lists were sent to
us. So this ugly code is extra paranoid and checks both possibilities.
This really needs a better cleanup.
2013-03-30 11:09:44 -04:00
Don Mitchell
c655c814e8
Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
...
add checking for metadata that we can't support editing for in Studio. T...
2013-03-29 12:38:42 -07:00
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
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
Chris Dodge
c55d54b071
also, we don't support metadata on chapters
2013-03-28 13:03:34 -04:00
Jay Zoldak
c9a7be6b9b
Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers
...
Feature/will/lettuce test helpers
2013-03-28 07:26:14 -07: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
Chris Dodge
03f9bb5d38
use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down
2013-03-27 22:37:07 -04:00
Don Mitchell
6d63d13fa8
Merge pull request #1753 from MITx/bug/christina/studio
...
Converter cleanup.
2013-03-27 12:46:01 -07:00
David Ormsbee
6e3d9608b4
Merge pull request #1754 from MITx/fix/cale/enrollment-integrity-error
...
An integrity error while creating an enrollment just means that our work...
2013-03-27 12:03:26 -07:00
Calen Pennington
122c8567c5
An integrity error while creating an enrollment just means that our work has already been done. Fixes https://www.pivotaltracker.com/story/show/46915947
2013-03-27 15:00:08 -04:00
Victor Shnayder
b0356e32b2
Merge pull request #1589 from MITx/peter/symbolic
...
Added support for superscripts in variables
2013-03-27 10:40:50 -07:00
Will Daly
cddc868656
Login URL resolves differently in LMS and CMS, which breaks login_test
...
when loaded by rake test_cms
I moved the test into lms/courseware/tests so they run correctly.
2013-03-27 13:01:10 -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
Will Daly
15ea32b095
Fixed bug 294, caused by unicode encoding error when creating logging
...
strings.
Added unit tests that verify the fix.
2013-03-27 12:53:58 -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
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
Victor Shnayder
68902b8039
Merge pull request #1747 from MITx/fix/cdodge/should-return-404-on-bad-asset-request
...
if we parse an invalid location in the content store middleware, then re...
2013-03-27 07:09: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
b0e2c82ad3
actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test.
2013-03-26 20:02:29 -04:00
Chris Dodge
a44ecdfcd6
if we parse an invalid location in the content store middleware, then return a 404, not a 500
2013-03-26 16:45:47 -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
Carlos Andrés Rocha
0612b0eb94
Add tests to advertised_start for partially parsable dates
2013-03-26 13:13:55 -04:00
Carlos Andrés Rocha
586f566b42
Use advertised_start as a simple string
...
LMS Lighthouse [#297 ]
2013-03-26 11:54:32 -04:00
Will Daly
0500ba4dd5
Disabled pylint warnings for lettuce steps:
...
* Missing docstring
* Redefining name from outer scope
2013-03-26 11:46:31 -04:00
Will Daly
27d5ebf027
pep8 fixes
2013-03-26 11:44:57 -04:00
Will Daly
00d25b684c
Moved modulestore flush code into terrain/course_helpers
2013-03-26 11:44:57 -04:00
Will Daly
e69931ec5a
Refactored studio lettuce tests to use terrain/ui_helpers for ui
...
manipulation
2013-03-26 11:44:56 -04:00
Will Daly
dde0d1676b
Refactored terrain/steps.py to use ui_helpers
...
Added a wait time before checking the page HTML,
and changed it to check just in the HTML body
2013-03-26 11:44:56 -04:00
