Commit Graph

30834 Commits

Author SHA1 Message Date
cewing
ef4836503f MIT CCX: Use CCX Keys - responses to code review
remove references to middleware that were missed previously

use key apis rather than local implementation of key conversion.  remove local implementationa

remove spurious test for attribute

fix test setUp to avoid unneeded flattening

code quality fixes

add security check ensuring that the coach is coach for *this* CCX.

prevent ccx/deprecated course id problems

1.  do not allow ccx objects to be created if the course id is deprecated
2.  filter out any ccx memberships that involve deprecated course ids (in case there are bad ccxs in the database)

Fix test failures and errors arising from incorrect code path execution

Create context manager to handle unwrapping and restoring ccx values for the modulestore wrapper, employ it throughout modulestore wrapper implementation
2015-06-12 00:01:24 -07:00
cewing
6a0c9aee9d MIT CCX: Use CCX Keys
Implement the use of CCX opaque keys throughout the ccx code base

include the new custom ccx id package in the github checkouts list

update the coach dashboard wrapper to get CCX information from the incoming course_id, if possible

update function signatures for all view functions to expect CCX as passed by the dashboard wrapper (default to None), remove calls to get_ccx_for_coach as the ccx is passed in.

update reverse calls in python view code to use a CCXLocator for the URL instead of a CourseLocator

use CCXLocator where necessary

use course id to find ccx, instead of thread local

remove unused method and related tests

use course id for getting ccx

provide course id to the get_current_ccx method

ensure the course id passed in is a CourseKey instance of some type whether it starts out as a string or not

use the provided block to figure out what the course_id should be, then get the ccx for that

redirect to ccx dashboard using coach ccx if no ccx is passed in

update student dashboard listing for ccx to build an appropriate url from a CCXLocator, not from the course locator.

refactor building the ccx locator so we don't have to do it repeatedly

begin test refactoring after ccx_keys introduction

Ensure that when access checking happens, the course_locator form of a ccx locator is used.  This ensures that the access check happens against the course and it is not necesarry to duplicate the entire access control structure for the course.

pick up api change in ccx-keys

create and conditionally use a wrapper for the mixed modulestore returned by xmodule.modulestore.django.modulestore

the wrapper will strip and restore ccx values from CourseKey and UsageKey objects

fix return values on a few methods

remove unused symbol

pull updated ccx-keys package

set course_id on the caching descriptor system to avoid api incompatibilities in some subsystems

use ccx.course instead of self.course

fix get method to find course keys from blocks that are not themselves keys but have a location attribute (which will be a key)

if an item coming out of the db has children, restore the ccx to them as well

if the block passed in has a CCX key, unwrap that before we try to look up the override, otherwise it will never be found.

pick up a change in the ccx keys package that allows for stripping CCX identity from a usage key

begin writing tests to cover this modulestore wrapper

remove the switch_pocs view, the url pattern for it, and the tests that covered it

remove the ccx context and the middleware responsible for setting the current CCX.  These are no longer needed

all dashboard views should raise 404 if a ccx is not provided by the coach_dashboard decorator

code quality

prevent errors resulting from trying to `get` a ccx based on non-unique criteria.

remove obsolete usage of ACTIVE_CCX_KEY

fix setUp method for grading tests to properly create grades for the ccx rather than for the course.

clean up reverse calls

code quality

adding docstrings to clarify purpose of this patch

fix bug in getting ccx for coach

fix grading views to properly fetch a ccx-ified course so that grades for that version will be calculated

fix small errors in modulestore implementation

fix errant merge marker

update call to get_current_ccx after key refactoring merged with tab changes
2015-06-12 00:01:24 -07:00
Sarina Canelake
233aba74a3 Merge pull request #8222 from Stanford-Online/giulio/font-awesome-icon-names
BUGFIX: CCX Font Awesome icon name fixes
2015-06-12 00:02:36 -04:00
Ben Patterson
32ab544b77 Merge pull request #8494 from edx/revert-8347-mcgachey-lti-authentication
Revert "[LTI Provider] Basic LTI authentication"
2015-06-11 21:12:05 -04:00
Ben Patterson
f8f2e2121a Revert "[LTI Provider] Basic LTI authentication" 2015-06-11 21:06:02 -04:00
David Ormsbee
fb491bf265 Merge pull request #8347 from mcgachey/mcgachey-lti-authentication
[LTI Provider] Basic LTI authentication
2015-06-11 19:51:57 -04:00
Will Daly
9d60b0e07a Merge pull request #8444 from edx/will/credit-provider-part-two
Credit provider integration Python API (Part 2 of 3)
2015-06-11 17:38:42 -04:00
Kelketek
a61b9106ef Merge pull request #8312 from open-craft/kelketek/fix-flaky-lib-test
(SOL-618) Fix for flaky library users studio test
2015-06-11 15:25:35 -05:00
Christopher Lee
203e512d4e Merge pull request #8487 from edx/clee/discussion-api-delete-comment-rebased
Clee/discussion api delete comment rebased
2015-06-11 16:01:28 -04:00
christopher lee
205c735865 Added comment deletion in the discussion API 2015-06-11 14:09:02 -04:00
Sarina Canelake
7df880f514 Merge pull request #8483 from AkA84/update-authors
Update AUTHORS
2015-06-11 12:44:18 -04:00
Greg Price
94c1bf495a Merge pull request #8437 from edx/gprice/discussion-api-edit-comment
Add comment editing to discussion API
2015-06-11 12:28:23 -04:00
Alessandro Verdura
e25f62da6b Add myself to AUTHORS 2015-06-11 18:05:32 +02:00
Greg Price
895731f526 Add comment editing to discussion API
This is done via PATCH on a comment instance endpoint.
2015-06-11 11:39:01 -04:00
Will Daly
8988aa1c9e Credit provider integration Python API
* Add end-point for initiating a request for credit from a provider.
* Add an end-point for a provider to update the status of a request (approved / denied).
2015-06-11 11:34:25 -04:00
Will Daly
26f1ecb6a5 Merge pull request #8458 from edx/will/remove-v2-footer
Remove V2 of the EdX.org footer
2015-06-11 10:43:30 -04:00
Edward Zarecor
ac6e259388 Merge pull request #8467 from edx/release-2015-06-10-conflict
Release 2015 06 10 conflict
2015-06-11 10:16:48 -04:00
Muzaffar yousaf
3706949eab Merge pull request #8432 from edx/muzaffar/bulk-emails
Remove course_title from bulk email.
2015-06-11 18:10:00 +05:00
Ben Patterson
e99a56f3a4 Merge pull request #8470 from edx/benp/flag-flakies-jun2015
Flag test as flaky. See SOL-975
2015-06-11 06:18:47 -04:00
Clinton Blackburn
ce8550dba6 Merge pull request #8469 from edx/clintonb/course-structure-api-cleanup
Removed IsAuthenticatedOrDebug
2015-06-10 21:27:36 -04:00
Matt Drayer
a9c9c15ced Merge pull request #8463 from edx/mattdrayer/SOL-449
mattdrayer/SOL-449: Remove @skip decorator
2015-06-10 21:15:49 -04:00
Ben Patterson
5977492867 Flag test as flaky. See SOL-975 2015-06-10 20:54:39 -04:00
Brian Talbot
d6a2bcfa69 Merge pull request #8465 from edx/talbs/SOL-973
Web Certificates: Only Hide Staff Signature for Honor/Base Rendering
2015-06-10 20:52:18 -04:00
Clinton Blackburn
2da42d5efa Removed IsAuthenticatedOrDebug
IsAuthenticatedOrDebug hides potential issues with API client code that is run in local environments and later deployed to production where authentication fails.

XCOM-193
2015-06-10 18:55:27 -04:00
Brian Talbot
fbe09770a4 Web Certs: adjusting base/honor-code rendering to only hide staff signatures
SOL-973
2015-06-10 18:47:26 -04:00
Ben McMorran
a7e49c2113 Merge pull request #8441 from edx/benmcmorran/team-api-membership
TNL-1907 Implement Course Team Membership API
2015-06-10 17:17:25 -04:00
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Ben McMorran
695f19c420 TNL-1907 Implement Course Team Membership API 2015-06-10 20:40:02 +00:00
Brian Talbot
5faaca0d01 Merge pull request #8464 from edx/talbs/fix-sass+css-compile
FIX - Compile Sass to CSS directory Clean Up
2015-06-10 15:24:22 -04:00
Will Daly
5198257cbe Merge pull request #8461 from edx/will/verify-student-cleanup
Remove unused code left over from ECOM-188.
2015-06-10 14:44:51 -04:00
Brian Talbot
5ff2a3af3f tidying up loose ends from sass compilation to css dir change
* adding in missing web certs Sass/CSS asset settings
* updating .gitignore
2015-06-10 14:23:13 -04:00
Matt Drayer
4dd55609ab Merge pull request #8430 from edx/asadiqbal08/SOL-971
SOL-971
2015-06-10 14:21:42 -04:00
Matt Drayer
aadb902cc7 mattdrayer/SOL-449: Remove @skip decorator 2015-06-10 14:20:39 -04:00
Renzo Lucioni
0349090815 Merge pull request #8456 from edx/renzo/payment-button-ui
Payment button UI modifications
2015-06-10 14:04:59 -04:00
Waheed Ahmed
1b3efabaa0 Merge pull request #8457 from edx/waheed/tnl2425-fix-slow-transaction-xblock-outline
Fixed slow transaction on xblock outline handler.
2015-06-10 23:00:27 +05:00
Awais Qureshi
2374685dc5 Merge pull request #8462 from edx/awais786/ECOM-1644-message-format
ECOM-1644 minor message updation.
2015-06-10 22:59:32 +05:00
AlasdairSwan
2092d732a7 Merge pull request #8460 from edx/alasdair/footer-mobile-app-link-bug
Fixes bug with app links in new footer
2015-06-10 13:38:41 -04:00
Will Daly
1cc776ff19 Remove V2 of the EdX.org footer 2015-06-10 13:13:32 -04:00
Will Daly
69306da49a Remove unused code left over from ECOM-188. 2015-06-10 13:08:23 -04:00
Awais
d5ca25e197 ECOM-1644 minor message updation. 2015-06-10 22:08:23 +05:00
AlasdairSwan
ff849d206a Fixes bug with app links in new footer 2015-06-10 12:41:49 -04:00
Waheed Ahmed
b328c0dcdc Fixed slow transaction on xblock outline handler.
TNL-2425
2015-06-10 21:03:52 +05:00
Peter Fogg
a3976705ed Merge pull request #8453 from edx/peter-fogg/team-api-test-fix
Fix updating immutable request dictionary.
2015-06-10 11:57:24 -04:00
Ben Patterson
2e9759ee43 Merge pull request #8451 from edx/benp/cohort-search-flakiness-jun2015
Fix for flaky behavior in cohort search tests. TNL-2362
2015-06-10 11:46:08 -04:00
Ben Patterson
35aed4bf87 Fix for flaky behavior in cohort search tests. TNL-2362 2015-06-10 11:44:56 -04:00
Renzo Lucioni
d6c0460483 Payment button UI modifications
Includes button copy revision and a styling tweak to make the selected payment button appear active while disabled.
2015-06-10 11:28:51 -04:00
Peter Fogg
d74bb36634 Fix updating immutable request dictionary.
Django's `QueryDict`s are immutable during normal running, and so they
must be copied if any updates are to be made to them. In testing,
though, `request.DATA._mutable` is `True`, so tests can falsely pass.
2015-06-10 11:15:02 -04:00
asadiqbal
302d7a0152 SOL-971
Allow microsites to override content

more test checks

Fix pylint error (duplicate import)

SOL-971 Changes
2015-06-10 19:26:30 +05:00
Calen Pennington
3c2bfc70a3 Merge pull request #8259 from jazkarta/include-ccx-key-dependency
MIT CCX add ccx-keys as a dependency of edx
2015-06-10 09:57:45 -04:00
Awais Qureshi
16bbdc7fca Merge pull request #8329 from edx/awais786/ECOM-1494-remove-midcourse-models
ECOM-1494 removing models.
2015-06-10 18:24:39 +05:00