Commit Graph

432 Commits

Author SHA1 Message Date
Gabe Mulley
3c5caaf762 REVE-103: Fix masquerade for feature based enrollments 2018-12-03 12:05:00 -05:00
Feanil Patel
eb8b5575ae Correct to use datetime instead of date. 2018-12-03 10:38:48 -05:00
Calen Pennington
bced52b728 Merge pull request #19334 from cpennington/enabled-as-of-datetime
Enabled as of datetime
2018-11-30 15:09:11 -05:00
Calen Pennington
31047260cc Switch ContentTypeGatingConfig.enabled_as_of and CourseDurationLimitConfig.enabled_as_of to datetimes 2018-11-30 10:02:53 -05:00
Matthew Piatetsky
bbfbd43cb7 Merge pull request #19335 from edx/REVE-108
Ensure staff users do not see expiration banner
2018-11-29 12:42:25 -05:00
Calen Pennington
af86f7856c Merge pull request #19333 from cpennington/enable-content-gate-partition-when-override-enabled
Enable content gate partition when override enabled
2018-11-29 10:59:47 -05:00
Calen Pennington
f8833e1ffc Enable the ContentTypeGatePartition when the ContentTypeGatingConfig.studio_override_enabled is True 2018-11-29 10:24:41 -05:00
Matthew Piatetsky
08301a484e Ensure staff users do not see expiration banner 2018-11-29 09:45:49 -05:00
Matthew Piatetsky
815acda002 Populate experiment data with holdback key post enrollment and check holdback key when setting user group 2018-11-28 13:40:57 -05:00
Calen Pennington
2a42628e19 Put actual data in ContentTypeGatingConfig and CourseDurationLimitConfig __str__ methods 2018-11-28 12:19:33 -05:00
Calen Pennington
f17f88741a Add GlobalStaff to role tests for course duration limits and content gating 2018-11-27 15:26:00 -05:00
emma-green
5167cf6cb4 Merge pull request #19288 from edx/emma-green/reve-74/make-sure-content-experiments-work-b
add content experiments test to content gating
2018-11-26 17:12:29 -05:00
Emma Green
2d5044512f add content experiments test to content gating 2018-11-26 16:29:11 -05:00
Bill Filler
af8f1029cd Merge pull request #19293 from edx/bfiller/REVE-96
Don't allow audit-only courses to expire
2018-11-26 15:49:02 -05:00
Matt Tuchfarber
d34c65a559 Merge pull request #19311 from edx/tuchfarber/content_gating_i18n
Add translation for content gating access denied message
2018-11-26 14:46:50 -05:00
Bill Filler
7b684106ba Don't allow audit-only courses to expire 2018-11-26 14:28:50 -05:00
Matt Tuchfarber
8b5b92b01a Add translation for content gating access denied message 2018-11-26 13:27:12 -05:00
Bessie Steinberg
1bbd9dd131 Merge pull request #19301 from edx/bessiesteinberg/REVE-23-beta-testers
REVE-101: Fix Beta Tester Experience and Test
2018-11-26 10:01:22 -05:00
Gabe Mulley
1441cba962 Merge pull request #19272 from edx/reve-37/prevent-studio-edits
REVE-37: prevent studio edits to feature based enrollments
2018-11-26 09:57:23 -05:00
Gabe Mulley
5177e994c8 REVE-37: Prevent modifications to feature based enrollment user partitions 2018-11-25 21:42:02 -05:00
Bessie Steinberg
4baedd37eb REVE-101: Fix Beta Tester Experience and Test
Fix content type gating and duration gating expierence for Beta Testers

- Beta Testers are users who are granted early access to the course to
  test it out, they should not be gated on type or duration
- This change makes sure beta testers will have access to graded content
  and their access will not expire
- Added unit tests for the above change
2018-11-21 16:22:36 -05:00
Calen Pennington
b295472363 Use generator expressions to make Mobile API constraints clearer 2018-11-21 12:18:10 -05:00
Calen Pennington
0cb48dfe1c Add StackedConfigurationModels for managing content_type_gating and course_duration_limits 2018-11-21 12:18:10 -05:00
Bessie Steinberg
1de077725a REVE-23: Test Course Team Roles
- Create tests for the two types of course team roles (i.e. ensure that both instructor and staff course roles have access to graded content and their access won't expire)

Remaining work:
- This change does not include all types of course staff users (ex. discussion moderators, beta testers, TAs)
2018-11-20 16:39:20 -05:00
Matt Tuchfarber
be2d55a54e Remove root path of static image 2018-11-20 15:31:55 -05:00
Cali Stenson
4dcda2858e Add group partitions information to user metadata in the dom.
This information will inform our A/B testing and experiments.

REV-612
2018-11-16 16:34:17 -05:00
Gabe Mulley
009c1f7901 REVE-81: fix errors in drag and drop and ORA2 xblocks
Also fixes REVE-82
2018-11-15 14:29:51 -05:00
Matt Tuchfarber
cc58aaaf8a Merge pull request #19269 from edx/tuchfarber/add_usd_to_content_gating
Add USD to content gating upsell
2018-11-15 13:53:46 -05:00
Matt Tuchfarber
53536f2c96 Add USD to content gating upsell 2018-11-14 15:59:11 -05:00
Cali Stenson
c34cbba464 Add Xblock Handler tests for content gating.
REVE-13
2018-11-14 10:55:51 -05:00
Awais Jibran
4b9a8547d4 Merge pull request #19258 from edx/revert/paulo/anonymous-views
Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views"
2018-11-12 13:03:44 +05:00
Cali Stenson
adffc11856 REVE-18: Test Content Type Gating For All Modes 2018-11-09 16:57:12 -05:00
Bill Filler
8409515be5 Only display content upsell message for Audit track
REVE-39
2018-11-09 13:18:55 -05:00
Awais Jibran
194c6bacb6 Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views"
This reverts commit f9ae594dfe, reversing
changes made to 7c08e50fde.
2018-11-09 22:49:14 +05:00
Cali
72bdb24cdd Merge pull request #19247 from edx/cstenson/lti_problem_content_gating_tests
Add LTI problem type tests on content gating.
2018-11-09 10:01:15 -05:00
Cali Stenson
1ec08701d2 Add LTI problem type tests on content gating.
REV-492
2018-11-09 09:23:44 -05:00
Matthew Piatetsky
98069ba2cb Merge pull request #19250 from edx/REV-503/add-banner-to-courseware
add expiration banner
2018-11-08 18:17:43 -05:00
Matthew Piatetsky
6cc4fb34be add expiration banner 2018-11-08 17:27:12 -05:00
Matt Tuchfarber
be472a8d52 Extract upsell into template, extract ecomm call, use mobile utils 2018-11-08 11:40:06 -05:00
Gabe Mulley
372d51fd46 Display an upsell message instead of gated content
REV-504
2018-11-08 11:40:02 -05:00
Matthew Piatetsky
bd6018a4be Merge pull request #19236 from edx/REVE-78
change access_duration to be weeks_to_complete or default MIN_DURATION for all courses
2018-11-07 15:23:36 -05:00
Matthew Piatetsky
dfe189e9bb change access_duration to be weeks_to_complete or MIN_DURATION for both SP and IP courses 2018-11-07 13:18:25 -05:00
Matthew Piatetsky
b996fd1b6e do not gate zero weight problems 2018-11-07 12:18:53 -05:00
Cali Stenson
549941e608 Add has access tests to content gating graded problem types.
REV-492
2018-11-07 09:08:46 -05:00
David Ormsbee
f9ae594dfe Merge pull request #18720 from open-craft/paulo/anonymous-views
Support for anonymous_view
2018-11-07 08:45:15 -05:00
Paulo Viadanna
e6e0a02e0a Adds CouseModule.course_visibility and XBlock.public_view() for unenrolled users access to courses.
The course_visiblity field can have one of three values:
1. private (default): This keeps the standard access rules.
2. public_outline: Allows unenrolled and anonymous users access to the outline.
3. public: Allows unenrolled and anonymous users access to both outline and
   course content.

When an unenrolled user accesses course content, instead of student_view(),
public_view() is used. A default implementation is provided for XBlocks
which do not implement this view. The public_view() must not have any
functionality which assumes the presence of a valid User and should show
a readonly only interface for the XBlock content.
2018-11-07 16:18:39 +05:00
Ned Batchelder
3353e7425e Remove unused imports 2018-11-03 16:07:05 -04:00
Ned Batchelder
8acea435cf setUpClassAndTestData is tricker than pylint understands 2018-11-02 11:06:59 -04:00
Calen Pennington
76859f04a8 Don't add the ContentGatingPartition to group_access in content_type_gating.field_overrides if the waffle flag is off 2018-11-01 15:20:15 -04:00
Calen Pennington
83d676cbfa Add Content Type Gating Behind Waffle Flag
Content Type Gating: Xblocks that have a graded component cannot be
accessed by audit track users.
  - Caveats:
    - In studio, instructors can set certain xblocks to be available to
      all users, but graded components will default to not being
      available for audit users
    - If a course does not have a verified mode option, all users will
      have access to graded content.

The Waffle Flag: The waffle flag is of for now.
  It's name is: ```content_type_gating.debug```

This Commit Does NOT Include: Displaying for a user WHY they do not have
access to a specific piece of content.  That change will be part of
another PR.
2018-10-31 12:34:48 -04:00