Commit Graph

259 Commits

Author SHA1 Message Date
Adam
2057f7db38 Merge pull request #6929 from edx/release
Release
2015-02-09 11:14:41 -05:00
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
b353ed2ea2 Better support specifying of modulestore configuration in test cases
The existing pattern of using `override_settings(MODULESTORE=...)` prevented
us from having more than one layer of subclassing in modulestore tests.

In a structure like:

    @override_settings(MODULESTORE=store_a)
    class BaseTestCase(ModuleStoreTestCase):
        def setUp(self):
            # use store

    @override_settings(MODULESTORE=store_b)
    class ChildTestCase(BaseTestCase):
        def setUp(self):
            # use store

In this case, the store actions performed in `BaseTestCase` on behalf of
`ChildTestCase` would still use `store_a`, even though the `ChildTestCase`
had specified to use `store_b`. This is because the `override_settings`
decorator would be the innermost wrapper around the `BaseTestCase.setUp` method,
no matter what `ChildTestCase` does.

To remedy this, we move the call to `override_settings` into the
`ModuleStoreTestCase.setUp` method, and use a cleanup to remove the override.
Subclasses can just defined the `MODULESTORE` class attribute to specify which
modulestore to use _for the entire `setUp` chain_.

[PLAT-419]
2015-02-04 09:09:14 -05:00
Calen Pennington
03a05fd9d4 Always call super(..).setUp() from setUp 2015-02-04 09:09:14 -05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -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
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
Jesse Zoldak
bf3b87bc64 Clean up all modulestore testcases
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
2014-12-02 07:09:36 -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
6763c5dd74 Fix PEP8: E126 continuation line over-indented
for hanging indent
2014-11-24 20:46:44 -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
stv
500499b678 Fix PEP8: E231 missing whitespace after '[:,]' 2014-11-10 19:31:05 -08:00
stv
cf9308144d Fix PEP8: E302 expected 2 blank lines, found 1 2014-11-10 11:00:11 -08:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware.
LMS-6622
2014-08-06 19:58:20 +05:00
David Baumgold
5457775cfe Replace check_for_get_code with assert_request_status_code
More flexible, uses the word "assert", method instead of function
2014-08-05 13:36:49 -04:00
Sarina Canelake
2aea261d48 Merge branch 'release'
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
Sarina Canelake
a9cad6a5bb Fix logging bug in openended grading 2014-06-09 15:16:18 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library
[LMS-2757]
2014-05-29 17:03:35 -04:00
Don Mitchell
08aaa97bfb Serialize course_key at last possible code junction 2014-05-20 11:58:03 -04:00
Don Mitchell
bf8ca487bb fix staff_grading server error 2014-05-12 16:25:27 -04: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
Waheed Ahmed
9067ebe815 Fixed import of "dog_stats_api" in staff_grading_service.py.
LMS-2521
2014-04-09 18:11:40 +05: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
0513e144b1 Actually push json parsing all the way down to the bottom of the GradingService get and post methods 2014-04-01 14:04:17 -04:00
Calen Pennington
c9a5e9b88d Record metrics about the staff grading service 2014-04-01 14:04:17 -04:00
Calen Pennington
6430e7e98c Make GradingServices always return dictionaries, rather than sometimes returning strings 2014-04-01 14:04:16 -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
Waheed Ahmed
741881b360 Internationalization fixed for error msg on staff grading page.
LMS-2195
2014-03-17 12:38:20 +05:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id
Dbarch/parse course
2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -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
Waheed Ahmed
d5cadf0008 Really large posts to ORA like peer grading feedback fixed.
ORA-201
2014-01-28 15:50:16 +05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Adam Palay
517ca9329b removes references to specific edx email addresses (STUD-1069) 2013-12-23 16:28:08 -05:00
cahrens
df09e99ad1 Create explicit Locations.
Part of STUD-1030
2013-12-12 14:37:00 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
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
Don Mitchell
80c83f0b88 Merge pull request #1508 from edx/dhm/expect_json
Change expect_json to put parsed json in new attr
2013-10-29 14:02:32 -07:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
Calen Pennington
10ee2dea82 Clean up imports 2013-10-29 10:36:22 -04:00