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
chrisndodge
1c47573bd7
Merge pull request #1669 from MITx/fix/vik/add-oe-tab
...
Fix/vik/add oe tab
2013-03-29 13:55:58 -07:00
Vik Paruchuri
033f5ce73c
Make process to add open ended tab to studio reversible
2013-03-29 15:53:28 -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
Chris Dodge
60e295895e
remove unused parameter
2013-03-29 15:26:21 -04:00
brianhw
6b1e1b1425
Merge pull request #1769 from MITx/fix/ned/cleanup-wacky-code
...
Enough is enough.
2013-03-29 12:10:23 -07: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
Vik Paruchuri
b8e6c94dd6
Add in a comment
2013-03-29 13:57:16 -04:00
Jay Zoldak
a5b1428bba
Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests
...
Feature/will/speed up unit tests
2013-03-29 10:53:10 -07:00
Vik Paruchuri
5aa357938d
Minor fixes for things that broke in the merge
2013-03-29 13:48:20 -04:00
Vik Paruchuri
65c2fd5f0c
Fix some post-merge errors
2013-03-29 13:22:13 -04:00
Jay Zoldak
d044d5c48d
a few more pep8 fixes
2013-03-29 13:15:33 -04:00
Vik Paruchuri
20bbf75fba
Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab
...
Conflicts:
cms/djangoapps/contentstore/utils.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_metadata.py
2013-03-29 13:10:47 -04:00
David Ormsbee
f6e9b2edd7
Merge pull request #1767 from MITx/hotfix/diana/input-state-fix
...
Remove the default and prevent input_state from persisting across problems
2013-03-29 09:29:09 -07:00
Diana Huang
17adc986bd
Remove the default and prevent input_state from keeping around
...
unnecessary data.
2013-03-29 12:16:27 -04:00
David Ormsbee
34899c20ba
Merge pull request #1764 from MITx/hotfix/diana/random_check_bug
...
Fixed bug in parsing of urandom struct so that seed
2013-03-29 08:10:49 -07:00
Jay Zoldak
b63aae221e
small pep8 pylint and superclass fixes
2013-03-29 10:41: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
bbb53a17f8
add some depth optimziations for edit subsection and unit pages as well
2013-03-29 09:58:03 -04:00
Will Daly
5bf839c9a9
Guard against trying to load a template when checking pages.
2013-03-28 16:55:20 -04:00
Will Daly
d92533bb51
Test case now drops the mongo collection
2013-03-28 16:41:55 -04:00
Will Daly
86bc70c3c2
Reverted cms changes back
2013-03-28 15:00:19 -04:00
Chris Dodge
ee5076bda9
fix incorrect comment
2013-03-28 14:48:12 -04:00
Ned Batchelder
252f9364a6
Merge pull request #1761 from MITx/content/rocha/utaustinx-courses
...
Content/rocha/utaustinx courses
2013-03-28 10:26:02 -07:00
Carlos Andrés Rocha
a15baa97c5
Add UTAustinX landing page
2013-03-28 13:23:58 -04:00
Carlos Andrés Rocha
4050da6b4c
Enable meta-universities (organizations that contain other)
2013-03-28 13:23:50 -04:00
Chris Dodge
c55d54b071
also, we don't support metadata on chapters
2013-03-28 13:03:34 -04:00
Will Daly
f652fb5f73
Pylint and pep8 fixes
2013-03-28 12:51:09 -04:00
Will Daly
6f8c9b4a9f
Optimized ModuleStoreTestCase to reload templates only once
...
over all test runs.
2013-03-28 12:31:46 -04:00
Chris Dodge
1c2a8a97cd
remove unnecessary debug log message
2013-03-28 11:38:22 -04:00
Chris Dodge
197f52539f
add some unit tests
2013-03-28 11:37:53 -04:00
chrisndodge
210101dc21
Merge pull request #1759 from MITx/bug/christina/grading
...
Bug fix for grading type not showing on course outline (#258 ).
2013-03-28 08:11:28 -07:00
cahrens
7279f9c460
Bug fix for grading type not showing on course outline ( #258 ).
2013-03-28 10:54:10 -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
Will Daly
13c01ec3fc
Randomized instructor page tests
2013-03-28 10:03:05 -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
Will Daly
bf37d4a9a3
Randomized loading of test pages for dark launch test
2013-03-28 09:33:51 -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
Will Daly
c48f119cec
Skip test of mock_xqueue_server
2013-03-28 09:13:28 -04:00
Will Daly
3eefb7d5ec
Resolved conflicts from rebase to master; fixed keyword error caught by
...
pylint
2013-03-28 08:58:56 -04:00
Will Daly
27a31230bf
Removed full course tests
2013-03-28 08:55:45 -04:00
Will Daly
7978c581db
Changed test for checking all pages to checking a random page
2013-03-28 08:55:16 -04:00
