Commit Graph

51 Commits

Author SHA1 Message Date
Calen Pennington
4851062987 Don't instantiate bogus modulestores just to get template rendering in old ORA 2015-02-06 15:20:59 -05:00
Calen Pennington
980f30c17f Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it 2014-12-12 21:45:21 -05:00
stv
b215d771b7 Fix PEP8: E128 continuation line under-indented
for visual indent
2014-11-24 20:46:50 -05:00
stv
4d30aedf4e Fix PEP8: E127 continuation line over-indented
for visual indent
2014-11-24 20:46:50 -05:00
stv
2ce5a6ceed Fix PEP8: E125 continuation line
does not distinguish itself from next logical line
2014-11-24 20:46:44 -05:00
Calen Pennington
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds the non-courseware lms/djangoapps and lms/lib.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-08 12:09:23 -04:00
Stephen Sanchez
751bd71a7b Merge remote-tracking branch 'origin/release' 2014-04-03 11:06:09 -04:00
Adam Palay
8935166c7a Revert "Open ended panel headings not internationalized."
This reverts commit eb9133aeb6.

ORA-352
2014-04-02 11:06:41 -04:00
Calen Pennington
6c06b39b3f Centralize when json parsing of responses from controller_query_service happens 2014-04-01 10:10:54 -04:00
Waheed Ahmed
eb9133aeb6 Open ended panel headings not internationalized.
LMS-2169
2014-03-31 11:25:10 +05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere.
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
2014-02-24 10:06:13 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
2014-02-21 15:01:20 -05:00
Jay Zoldak
bc30addfb9 Unicode changes to support QRF
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
2014-01-30 16:20:36 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -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
Jason Bau
46fddc6d26 Merge pull request #1052 from edx/jbau/staff-needs-to-grade-use-get
use .get when checking combined notifications to handle missing keys
2013-09-19 07:49:39 -07:00
Jason Bau
aa0801907d use .get when checking combined notifications to handle missing keys 2013-09-18 23:47:31 -07:00
Calen Pennington
9643fd463f Rename xblock_field_data to xmodule_field_data 2013-09-18 10:49:41 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Vik Paruchuri
9211a38374 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
2013-08-15 11:36:11 -04:00
Vik Paruchuri
bd9097596c Remove annoying rubric parsing error, redo how notifications work 2013-08-08 13:16:32 -04:00
Vik Paruchuri
cb54081d2e Fix notification problem 2013-08-06 09:55:49 -04:00
Vik Paruchuri
1398b55713 Comment touched modules 2013-05-07 15:48:19 -04:00
Vik Paruchuri
258aebed20 Fix anonymoususer 500 error 2013-05-07 12:58:49 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -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
59b2f2ccd7 Move controller query service to xmodule side to prepare for ETA message displays 2013-02-20 16:19:17 -05:00
Vik Paruchuri
6a10ffc7da Fix up error messages to staff and students 2013-02-13 19:12:16 -05:00
Vik Paruchuri
8f7c145957 Remove old import statements 2013-02-13 09:45:29 -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
Vik Paruchuri
9bca4ebf21 Start to refactor grading settings 2013-02-11 17:32:11 -05:00
Vik Paruchuri
46da4cf241 Add in a better notification icon 2013-02-09 10:15:11 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Vik Paruchuri
0133c7c669 Patch peer grading tab to work 2013-02-05 16:32:40 -05:00
Vik Paruchuri
f742b7d865 Start to integrate peer grading xmodule back into notifications 2013-02-04 12:07:03 -05:00
Vik Paruchuri
78f9f63466 Add in notification type for flagged submissions 2013-01-31 11:19:15 -05:00
Vik Paruchuri
6425a519fd Fix notifications to work with cache (sync timings) 2013-01-29 21:24:04 -05:00
Vik Paruchuri
665fb707b1 Cache notifications for 5 mins so that we don't hit the grading server on every web request 2013-01-29 21:24:03 -05:00
Vik Paruchuri
68f563a178 Fix naming issue 2013-01-29 21:24:03 -05:00
Vik Paruchuri
8b8c1dbe60 Fix query error 2013-01-29 21:24:03 -05:00
Vik Paruchuri
8602e1595b Pass proper parameters, fix templating 2013-01-29 19:31:03 -05:00
Vik Paruchuri
0f212cc8f2 Fix course id passing, template rendering 2013-01-29 19:31:02 -05:00
Vik Paruchuri
6b7ba37999 Combined notification view 2013-01-29 19:30:04 -05:00
Vik Paruchuri
22a2bdaa3d Disable student problem list caching, build out notifications 2013-01-29 19:30:04 -05:00
Vik Paruchuri
4112f8ad8e Pass back dictionaries where needed from notifications functions 2013-01-29 19:30:04 -05:00