Commit Graph

14265 Commits

Author SHA1 Message Date
Calen Pennington
97c2513ed8 Push set_many object creation down into per-type caches 2015-05-20 15:07:24 -04:00
Calen Pennington
a0555d4cdc Add more documentation to DjangoOrmFieldCache 2015-05-20 15:07:24 -04:00
Calen Pennington
7a9923e289 Inline find_or_create 2015-05-20 15:07:24 -04:00
Calen Pennington
6ce7cc771a Move has logic down into per-scope caches 2015-05-20 15:07:23 -04:00
Calen Pennington
43d41d6648 Move delete logic down into per-scope caches 2015-05-20 15:07:23 -04:00
Calen Pennington
d1fae17ca2 Move the logic from find into the methods that use it 2015-05-20 15:07:23 -04:00
Calen Pennington
3bcd5ceb50 Push has down into FieldDataCache from DjangoKeyValueStore 2015-05-20 15:07:23 -04:00
Calen Pennington
9338b6a480 Push delete down into FieldDataCache from DjangoKeyValueStore 2015-05-20 15:07:22 -04:00
Calen Pennington
ebb3c906ff Push set_many down into FieldDataCache from DjangoKeyValueStore 2015-05-20 15:07:22 -04:00
Calen Pennington
951c19d789 Push get down into FieldDataCache, from DjangoKeyValueStore 2015-05-20 15:07:22 -04:00
Calen Pennington
5df3c22651 Push cache_key transformations inside the cache objects 2015-05-20 15:07:21 -04:00
Calen Pennington
29606a170d Extract common django-orm-backed-cache functionality 2015-05-20 15:07:21 -04:00
Calen Pennington
7909bee511 Stop leaking private _data members from per-scope caches 2015-05-20 15:07:21 -04:00
Calen Pennington
01cf2a3225 Store cache objects, rather than dictionaries generated by cache objects 2015-05-20 15:07:21 -04:00
Calen Pennington
21bcf55dba Extract _all_block_types and _all_usage_keys out of cache class 2015-05-20 15:07:20 -04:00
Calen Pennington
4463f71148 Separate caching for particular fields from instantiating the cache 2015-05-20 15:07:20 -04:00
Calen Pennington
0d37ec8099 Change the central cache to store at two levels: first by scope, then by cache key 2015-05-20 15:07:20 -04:00
Calen Pennington
645d2a727f Move field_object -> cache_key transformations to the scope-specific caches 2015-05-20 15:07:19 -04:00
Calen Pennington
7353d40b16 Push field_object iteration inside _retrieve_fields, and rename to _cache_fields 2015-05-20 15:07:19 -04:00
Calen Pennington
9059727672 Extract cache instantiation into classes per-scope 2015-05-20 15:07:19 -04:00
Calen Pennington
fd0c47bc42 Extract query chunking from FieldDataCache 2015-05-20 15:07:18 -04:00
Calen Pennington
4182f87490 Add the candidate XBlockUserStateClient interface 2015-05-20 15:07:18 -04:00
Calen Pennington
4312c0e763 Enable PyContracts during tests 2015-05-20 15:07:18 -04:00
Greg Price
af69635f74 Merge pull request #8097 from edx/gprice/discussion-api-comment-list
Add comment list endpoint to Discussion API
2015-05-20 14:20:24 -04:00
Chris Dodge
f655e7c380 need to urlencode the course_id when constructing the registration redirect query string 2015-05-20 14:05:00 -04:00
Greg Price
2451e06788 Add comment list endpoint to Discussion API 2015-05-20 13:13:19 -04:00
chrisndodge
c40aa66d18 Merge pull request #8081 from edx/muhhshoaib/MAYB-65-MIT-PE-double-coupon-use-reported
MAYN-65 fixed the bug, removed the redemption table entry when the item is expired from the user cart
2015-05-20 12:28:17 -04:00
Phil McGachey
d43ffd3a56 [LTI Provider] Refactoring and clean-up 2015-05-20 08:44:58 -04:00
Sarina Canelake
c7424dd7ae Supply default url for XQA server 2015-05-19 14:19:04 -04:00
Christina Roberts
cff565060b Merge pull request #8052 from edx/christina/tag-events
Update student notes eventing for tags.
2015-05-19 13:55:57 -04:00
cahrens
0c7af25c79 Update student notes eventing for tags.
TNL-2172
2015-05-19 13:14:10 -04:00
Tyler Nickerson
df80a8d6e4 Merge pull request #8075 from edx/tyler-jwt-fullname
LMS now passes the full name of users to the ecommerce api client
2015-05-19 09:15:04 -04:00
Muhammad Shoaib
72bf9a5a6c MAYN-65 fixed the bug, removed the redemption table entry when the item is expired from the user cart
fix quality issues
2015-05-19 15:07:07 +05:00
Nickersoft
5359ff9d71 Passing full name to E-Commerce API 2015-05-18 16:12:10 -04:00
Greg Price
e124fb0643 Merge pull request #8059 from edx/gprice/discussion-api-thread-list-refactor
Refactor Discussion API thread list
2015-05-18 16:09:27 -04:00
David Baumgold
37ab2fc16a Wrap block with license info in LMS only 2015-05-18 14:35:08 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
Greg Price
7309352ef7 Refactor discussion API to use DRF serializer
This will make it easier to add the creation and update interfaces.
2015-05-18 14:03:02 -04:00
Greg Price
565cdb8edf Move Discussion API access control checks
The checks are now within the Python API instead of the DRF view. This
will be necessary for certain operations (like fetching/editing threads)
because the relevant course cannot be known until the thread is fetched
from the comments service. This commit updates the existing endpoints to
fit that pattern.
2015-05-18 14:03:02 -04:00
Muhammad Shoaib
392937d9e1 MAYN-68 fixed the bug, total credit card purchases amount does not include the bulk purchases. 2015-05-18 15:51:19 +05:00
Shrhawk
dd20badcf7 Merge pull request #7996 from edx/shr/bug/TNL-2119-Unicode-error-in-templating-bulk-course
bulk_email fix course_image_unicode name
2015-05-15 23:31:01 +05:00
Ned Batchelder
e97b94bde2 Merge pull request #8060 from edx/ned/add-supers
Add super() calls to setUp/tearDown that are missing them
2015-05-15 12:29:14 -04:00
Christopher Lee
a57f0d7410 Merge pull request #7794 from edx/clee/gated_content_mobile_api
MA-635 Block Mobile Content for unfulfilled milestones
2015-05-15 10:24:04 -04:00
christopher lee
5cef287c5d MA-635 Block Mobile Content for unfulfilled milestones
Previously, the mobile api did not check for pre-requisite courses
or entrance exams. This change checks for these milestones and then
returns course content accordingly.
2015-05-15 09:39:54 -04:00
muzaffaryousaf
cae5623fd9 Updating the django-countries version to support sorting.
Adding the pyuca to support sorting in differnet languages.

TNL-2047
2015-05-15 17:07:14 +05:00
muzaffaryousaf
378cf9bb7a Sending preferences and accounts data to template.
Fixing the pencil icon issue.

TNL-2047
2015-05-15 17:06:04 +05:00
muzaffaryousaf
2d08d669ca Learner Profile page tweaks.
TNL-2047
2015-05-15 17:06:02 +05:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
2015-05-14 18:14:21 -04:00
Jim Abramson
36060f3f9b Merge pull request #8053 from edx/jsa/xcom-1606
Update ecommerce-api-client and add regression test for XCOM-1606
2015-05-14 17:36:02 -04:00
jsa
31a232edc7 Update ecommerce-api-client and add regression test for XCOM-1606 2015-05-14 16:54:56 -04:00