Commit Graph

53983 Commits

Author SHA1 Message Date
Dillon Dumesnil
1bbfe2d583 Shorten Welcome Message fix
We want to ignore certain tags when they show up in the HTML.
This now ignores script tags and link tags (for stylesheets)
2020-04-08 07:46:46 -07:00
Syed Muhammad Dawoud Sheraz Ali
78aec0513d update edxval (#23662) 2020-04-08 17:47:37 +05:00
edX requirements bot
1e28719c41 Updating Python Requirements (#23661) 2020-04-08 12:22:19 +00:00
Zaman Afzal
c7e2f8d49a ENT-2651 Recovery email Field UX logic on Account Settings page was not same to dashboard (#23565) 2020-04-08 16:21:37 +05:00
Jansen Kantor
90885e4193 create team view teamset privacy fixes (#23607) 2020-04-07 22:04:23 -04:00
Jansen Kantor
1b2e10d96e add HasSpecificTeamAccess permission and change tests (#23608) 2020-04-07 21:21:14 -04:00
Jansen Kantor
480642e8c4 EDUCATOR-4995: text search returns private teamsets for anyone in bubble (#23586)
* Manually exclude private_managed teams from text search results
2020-04-07 21:13:42 -04:00
Jansen Kantor
6b9d4e49b3 EDUCATOR-4976 (Part 2): Tests for current behavior (#23567)
* tests for current teams api view behavior
2020-04-07 18:30:53 -04:00
Matt Drayer
2d82ac9e72 Merge pull request #23650 from edx/mattdrayer/ENT-2756
Upgrade edx-enterprise to 3.0.7
2020-04-07 13:36:42 -04:00
Matt Drayer
c469ac46d9 Upgrade edx-enterprise to 3.0.7 2020-04-07 13:06:53 -04:00
Michael Terry
76fdad7aae Merge pull request #23632 from edx/mikix/welcome-message
Cut off long course welcome messages
2020-04-07 12:06:37 -04:00
Farhanah Sheets
e373476430 Merge pull request #23649 from edx/revert-23514-aj/ss-retry-logic
Revert "Adds retry logic for software secure."
2020-04-07 12:05:10 -04:00
Feanil Patel
4a7101755c Merge pull request #23454 from edx/feanil/bokchoy_decision
Add a draft decision related to bokchoy experiment.
2020-04-07 11:55:07 -04:00
Waheed Ahmed
3dc3e10819 Revert "Adds retry logic for software secure." 2020-04-07 20:40:06 +05:00
Farhanah Sheets
ccdc2bd5d6 Merge pull request #23648 from edx/revert-23642-aj/remove-todo
Revert "Remove todo"
2020-04-07 11:39:44 -04:00
Waheed Ahmed
21105898da Revert "Remove todo" 2020-04-07 20:36:39 +05:00
Michael Terry
7a71356cd2 Cut off long course welcome messages
If a course welcome message is very long, cut it off with an
ellipsis and show a Show More button to reveal the full thing.

AA-46
2020-04-07 10:49:40 -04:00
Awais Jibran
f1421a62d0 Merge pull request #23618 from edx/aj/problem-grade-report
ProblemGradeReport OOM - Case1&2
2020-04-07 19:06:30 +05:00
Tim McCormack
5bbcb273ae Fix typo in read replica DB name for CMS (#23641)
(LMS side was already fixed.)
2020-04-07 13:43:22 +00:00
irfanuddinahmad
85f394bad9 Merge pull request #23647 from edx/iahmad/ENT-2612
ENT-2612 Fix issue with enterprise selection page redirect
2020-04-07 18:23:44 +05:00
Awais Jibran
ac49d4fd99 Pass course structure to CourseGradeFactory.iter 2020-04-07 18:02:15 +05:00
irfanuddinahmad
5301be1b29 ENT-2612 Fix issue with enterprise selection page redirect 2020-04-07 17:44:10 +05:00
Muhammad Soban Javed
fefb940744 Merge pull request #23634 from edx/BOM-1495
BOM-1495: Django 2.0: fails on comparing nested lists.
2020-04-07 16:41:10 +05:00
Awais Jibran
847f1ff124 Merge pull request #23642 from edx/aj/remove-todo
Remove todo
2020-04-07 13:00:54 +05:00
Hasnain Naveed
332a8329dc Merge pull request #23595 from edx/hasnain-naveed/ENT-2675
ENT-2675 | Added permission for staff user to change the student's en…
2020-04-07 12:46:08 +05:00
Awais Jibran
262b7f7bdc Remove todo 2020-04-07 11:03:17 +05:00
Awais Jibran
4b22554411 Merge pull request #23514 from edx/aj/ss-retry-logic
Adds retry logic for software secure.
2020-04-07 10:59:57 +05:00
Jeremy Bowman
3309078242 Prepare for django-oauth-toolkit 1.3.2 upgrade (#23637)
Prepare to upgrade to django-oauth-toolkit (module name oauth2_provider) 1.3.2 concurrently with the Django 2.2 upgrade (versions after 1.1.3 dropped support for Django 1.11). Key points:

* We can stop using a commit hash since versions 1.3.0 through 1.3.2 have been released since that commit.
* The validator in oauth_dispatch migration 0002 has been removed from DOT, but the whole table was removed in migration 0004 anyway. Newer DOT versions moved where redirect URI validation happens so it's no longer needed here.
* DOT 1.3.0 squashed its original 6 migrations and immediately deleted them. This required some changes in oauth_dispatch migrations 0006 and 0007 to deal with either numbering system.

When deploying to stage and production, we'll need to delete the history for oauth2_provider migrations 0002-0006 first (the new squashed 0001 migration has the same name as the original 0001). The deployment with DOT 1.3.2 will add a new 0002 migration which should then apply cleanly on the existing database state.

Should resolve https://openedx.atlassian.net/browse/BOM-1456 .
2020-04-06 19:10:19 -04:00
Jeremy Bowman
c4352a0a78 Fix invalid POST in test_module_render.py (#23639)
This looks like the last failing unit test under Django 2.2. One of a series of such failures resulting from Django no longer accepting None as POST data (since you can't really get it from a real request), most of which were already fixed by the Arbisoft team in the last few days.
2020-04-06 17:18:36 -04:00
Awais Qureshi
c664852627 Merge pull request #23623 from edx/awais786/BOM-1492
Django2 shopping_cart: temporary test fix
2020-04-07 00:20:32 +05:00
Feanil Patel
4084897180 Merge pull request #23636 from edx/feanil/old_use_of_course_id
Got the template that is used with tests but not this one.
2020-04-06 14:48:16 -04:00
Brian Mesick
129788606b Merge pull request #23407 from edx/bmedx/rename_start_end_courseoverview_2
Add writes to new field & data migration for backfiling data
2020-04-06 14:45:15 -04:00
AsadAzam
255dc26231 Merge pull request #23630 from edx/asad/prod-1394-logs
Added temporary logs
2020-04-06 23:32:41 +05:00
Feanil Patel
f61b2e44eb Got the template that is used with tests but not this one.
This dashboard template is only used for edx.org so we didn't catch this
in testing.  Updating it to use 'course' instead of 'course_id' to
instantiate a CourseEnrollment object.  Using 'course_id' is the old
way.
2020-04-06 14:25:58 -04:00
hunytalk
42503dd736 Add writes to new field 2020-04-06 14:13:20 -04:00
Feanil Patel
6b276e6742 Merge pull request #23633 from edx/feanil/bom-1455-preserve-last-name-limit
Limit the last_name field to 30 chars.
2020-04-06 13:41:28 -04:00
David Joy
90ec0c17a8 Merge pull request #23585 from edx/djoy/course_metadata_access_check
fix: Improving access check in CoursewareInformation view
2020-04-06 13:05:39 -04:00
Diana Huang
5d830de88d Merge pull request #23605 from edx/diana/remove-course-id-modes
Remove `course_id` field from CourseMode.
2020-04-06 13:00:47 -04:00
Awais Qureshi
95ca67ee48 Merge pull request #23626 from edx/BOM-1493
BOM-1493
2020-04-06 21:08:22 +05:00
Awais Jibran
f592f133c5 remove update_from_database from views. 2020-04-06 21:00:53 +05:00
Soban Javed
0ff96e7e25 fixed failures of test due to ordering issue in dict 2020-04-06 20:49:00 +05:00
Diana Huang
99863aebff Remove course_id field from CourseMode.
Handle this change appropriately in CourseModeFactory.
2020-04-06 11:21:28 -04:00
Feanil Patel
e4798e49d4 Limit the last_name field to 30 chars.
We don't use this field in edx-platform since we rely on UserProfile
instead.  But we need to do this to prevent accidental incorrect use of
this field.  Django adds a migration between 1.11 and 2.2 to increase
the length of this field that we are opting to skip.  This change
enforces the old limit.
2020-04-06 11:11:35 -04:00
Thomas Tracy
09d814f7fd Add link to coaching interstitial for MB students who have not signed up for coaching (#23492) 2020-04-06 10:35:45 -04:00
Feanil Patel
5b50a8cd97 Merge pull request #23583 from edx/feanil/test_propert_removal
WIP Remove the course_id property on student.CourseEnrollment.
2020-04-06 10:13:10 -04:00
Zachary Hancock
2cbc248a63 prevent empty string passing proctoring provider validation (#23610) 2020-04-06 09:45:10 -04:00
Feanil Patel
7a52a25132 Fix tests that were creating Enrollments via a course_id.
We now either pass in the relevant courseoverview or when creating the
enrollement we use the factory which automatically creates the relevant
CourseOverview object for testing purposes.
2020-04-06 09:37:36 -04:00
Feanil Patel
cf976abea0 Update how dashboard represents entitlements.
Pass in a CourseOverview object instead of expecting that passing id will work as expected.
2020-04-06 09:37:36 -04:00
Feanil Patel
3c618ad04d Fixup CourseEnrollmentFactory
Historically, the CourseEnrollment model used to have a `course_id`
field.  A lot of tests still call the factory using that.  Instead of a
`course_id` field this model now has a `course` field which is a foreign
key to the CourseOverview model.

The factory still accepts the course_id but uses it to create the
relevant CourseOverview object where necessary.  This commit fixes two
issues with the factory.

1. If the course id is passed in as`course_id` instead of `course__id`
then, the generated CourseOverview does not have the correct course_id.

2. Even though the CourseEnrollment model no longer needs the
`course_id` parameter, we were still passing it through.  We now remove
it so that it is not passed through to the CourseEnrollment model
instantiation.
2020-04-06 09:37:36 -04:00
Feanil Patel
7c115cca24 Remove the course_id property on student.CourseEnrollment.
It conflicts with an underlying related field on that model which seems
to be getting at the same value from the related table.

Add logging for incorrectly instantiating CourseEnrollment models.
This is to catch any places that might break this that are outside of
edx-platform. Django won't accept `course` values that aren't
course_overviews so we don't need extra logic to test that `course`
values are of the correct type.

fixup! Remove the course_id property on student.CourseEnrollment.
2020-04-06 09:36:35 -04:00