Calen Pennington
061a46beef
Formalize various access roles as objects
...
This centralizes the logic for group membership, and means that we
don't need to make queries to find out whether the legacy groups names exist.
2013-11-13 13:42:37 -05:00
Calen Pennington
864d831ce3
Use XBlock handlers for handle_ajax in XModules
...
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.
[LMS-230] [LMS-229]
2013-11-08 11:08:48 -05:00
Calen Pennington
10ee2dea82
Clean up imports
2013-10-29 10:36:22 -04:00
Calen Pennington
6b474724ac
Make XModuleDescriptor and XModule act as a single class
...
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
David Baumgold
d97921e6e2
Convert Studio JS to use require.js
2013-10-04 13:43:50 -04:00
Vik Paruchuri
9a6ae8f740
Clean up open ended problems view and fix error.
2013-09-27 16:02:12 -04:00
Giulio Gratta
68ce6ed1c8
Second batch of ORA UI fixes:
...
- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback
Changes after comments:
- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file
More changes:
- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
2013-09-26 09:26:35 -07:00
Vik Paruchuri
d6a2e06d9f
Test empty list behavior
2013-09-20 12:02:22 -04:00
Calen Pennington
9643fd463f
Rename xblock_field_data to xmodule_field_data
2013-09-18 10:49:41 -04:00
Vik Paruchuri
009017fe07
Address review comments
2013-09-13 11:06:40 -04:00
Calen Pennington
38de05c76c
Include mixins in advanced component class loading and preview modules
2013-09-06 13:37:03 -04:00
Calen Pennington
8201b1412e
Use XBlock 0.3
2013-09-06 09:45:59 -04:00
Will Daly
48c6daacb8
Removed unnecessary settings wrangling from ModuleStoreTestCase.
...
Modified navigation tests to use MixedModulestore
Updated factories to find editable modulestore
Updated test_submitting_problems
Updated test_tabs.py
Updated test_view_authentication
Updated test_views
Updated courseware/tests/tests.py
Updated test_masquerade
Updated test_module_render
Pylint fixes
Updated video and word cloud tests
Updated course wiki tests
Updated license and open_ended tests.
One open_ended test still failing due to Mako initialization issues
Updated staticbook
Updated django_comment_client tests
Updated instructor tests
Updated instructor task tests
Updated external_auth tests
Updated course_groups
2013-08-21 09:36:45 -04:00
Vik Paruchuri
306649f6ad
Fix test
2013-08-08 08:34:39 -04:00
Calen Pennington
76055aa211
Add a manage.py command that understands the extra edX options
2013-07-24 09:04:12 -04:00
Don Mitchell
3722685e1a
No longer persist XModule templates
...
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Jean Manuel Nater
1b94050ef6
Merge branch 'master' into jnater/courseware_tests
...
Conflicts:
lms/djangoapps/open_ended_grading/tests.py
2013-06-21 16:38:31 -04:00
Jean Manuel Nater
9bfddd4891
Addressed pull request feedback.
2013-06-21 14:05:57 -04:00
Ned Batchelder
61b53713d2
Remove unused imports from lms, as detected by pylint.
2013-06-19 16:56:34 -04:00
Calen Pennington
82606a062c
Make XModuleDescriptor use __init__ from XBlock
...
Fixes JIRA LMS-203
2013-06-17 13:38:57 -04:00
Vik Paruchuri
badd3a8d13
Properly stub out the controller_qs variable in the tested module. Test times out without this.
2013-05-31 13:14:19 -04:00
Vik Paruchuri
e9f05640f8
Update comments
2013-05-22 12:16:23 -04:00
Vik Paruchuri
3bd04290f5
Add tests, address review comments
2013-05-22 11:58:03 -04:00
Vik Paruchuri
6dfc490fc7
Json updates
2013-05-13 12:49:01 -04:00
Vik Paruchuri
fd46ebd1fa
Move some functions, make notification tests more robust
2013-05-08 19:04:07 -04:00
Vik Paruchuri
0d4b9d26cf
Add in a test, rescale preview images
2013-04-16 10:51:23 -04:00
Brian Wilson
99778b1b5b
add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.
2013-03-27 17:59:56 -04:00
Calen Pennington
531eb80eb2
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-13 12:18:04 -04:00
Vik Paruchuri
554cb752fa
Pep8 cleanup
2013-03-12 12:20:11 -04:00
Vik Paruchuri
cb4a7c663c
A somewhat working state for notifications. Combined open ended and peer grading xmodules still have significant errors.
2013-03-04 18:54:52 -05:00
Vik Paruchuri
b5786874ab
Wiring through some changes
2013-03-04 18:04:13 -05:00
Diana Huang
a789d6c363
Merge branch 'master' into diana/fix-self-assessment-test
2013-02-20 13:37:42 -05:00
Diana Huang
6e453c2b8b
Clean up and fix some peer grading tests.
2013-02-20 13:36:09 -05:00
Vik Paruchuri
4d57f1b9ee
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
2013-02-19 10:43:55 -05:00
Diana Huang
3e23b9e1f2
Merge pull request #1480 from MITx/diana/staff-grading-flagging
...
Flag submissions from staff grading view
2013-02-15 13:08:16 -08:00
Vik Paruchuri
7a3a56d4bc
Fixing tests
2013-02-13 15:20:59 -05:00
Vik Paruchuri
5f29e0e1a6
Fix OE tests
2013-02-13 15:11:37 -05:00
Vik Paruchuri
b9bf96520e
Move open ended grading xmodule support files into a separate directory. apparently prune down on number of imports
2013-02-11 18:43:47 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
Diana Huang
f3bb429915
Get and pass the new submission flagged information through
...
the controller to the backend.
2013-02-11 09:23:55 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Vik Paruchuri
ce87e6f221
Skip two tests
2013-02-05 14:57:59 -05:00
Vik Paruchuri
8027cc7024
Fix some issues with tests
2013-02-05 14:35:44 -05:00
Vik Paruchuri
134f2f7af7
Fix tests, bugfix for problem url error
2013-02-05 14:21:08 -05:00
Vik Paruchuri
e13de7543f
Test fixes, err response fixes, address review comments
2013-02-05 14:12:11 -05:00
Vik Paruchuri
34dc6e6320
Fix some issues with peer grading service
2013-02-05 13:37:55 -05:00
Vik Paruchuri
e8a690df5e
Update peer grading tests
2013-02-05 10:46:00 -05:00
Vik Paruchuri
443c3eda4f
Tests for peer grading service may be fixed.
2013-02-04 18:37:28 -05:00
Vik Paruchuri
c991c0489c
Fix open ended test with flagging
2013-02-04 10:26:25 -05:00
Diana Huang
8d64bfdbdb
Update tests to handle rubric scores
2013-01-28 08:41:39 -05:00
