Commit Graph

53924 Commits

Author SHA1 Message Date
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
Zia Fazal
3a73def603 Merge pull request #23622 from edx/ziafazal/ENT-2710
ENT-2710: Improved enterprise target regex
2020-04-06 18:36:18 +05:00
Manjinder Singh
c94beec16b Ran make upgrade with new contraints (#23609)
This adds contraints to:
kiwisolver: next release only works with python>=3.6

The was run to upgrade:
django-splash
django-wiki
edx-search
The previous versions were constraining django below 2.0.

Co-authored-by: Robert Raposa <rraposa@edx.org>
2020-04-06 09:20:04 -04:00
Muhammad Soban Javed
b3d68484eb Merge pull request #23606 from edx/BOM-1473
BOM-1473: Skip tests, failing in django2.1 because app is deprecated
2020-04-06 18:08:47 +05:00
irfanuddinahmad
efb4cd944c Merge pull request #23532 from edx/iahmad/ENT-2725-Implicit-Enterprise-Selection-When-Enrolling-With-Url
ENT-2725 added support for enrolment urls in multiple enterprise case
2020-04-06 18:00:47 +05:00
Usama Sadiq
baabbc5ffb Merge pull request #23625 from edx/usamasadiq/bom-1496
Django2.2 Post request update
2020-04-06 17:40:16 +05:00
Ahtisham Shahid
67c8e9b881 Merge pull request #23594 from edx/ahtisham/PROD-1388
Updated versions of fixed packages
2020-04-06 17:35:51 +05:00
Nick
0f8e871734 Merge pull request #23611 from edx/ndalfonso/AA-fix-mobile-banner
AA fix mobile reset dates banner
2020-04-06 08:28:53 -04:00
irfanuddinahmad
d105aac84d ENT-2725 added support for enrollment urls when user has multiple enterprises 2020-04-06 17:21:49 +05:00
M Zulqarnain
753b14e39b Merge pull request #23627 from edx/BOM-1497-98-99
BOM-1497 : POST None failures fixed
2020-04-06 17:09:04 +05:00
Awais Jibran
6205687aea Merge pull request #23624 from edx/aj/fix-reverse-error
Fixes `NoReverseMatch` exception.
2020-04-06 17:07:34 +05:00
usamasadiq
32a8c33055 Django2.2 Post request update 2020-04-06 16:10:26 +05:00
Zulqarnain
19f63a9682 Post None failure fix 2020-04-06 15:47:47 +05:00
Awais Jibran
934e58fb54 Fixes NoReverseMatch exception.
`django.urls.exceptions:NoReverseMatch lms.djangoapps.discussion.tasks.send_ace_message`
PROD-1224
2020-04-06 13:41:54 +05:00
Awais Qureshi
7eafc24212 Merge pull request #23619 from edx/awais786/BOM-1463
BOM-1463
2020-04-06 13:19:05 +05:00
Ahtisham Shahid
123b2bb0db Merge pull request #23540 from edx/ahtisham/PROD-1412
Removed tech email form error templates
2020-04-06 12:50:44 +05:00
zia.fazal@arbisoft.com
f56235248a Improved enterprise target regex
Improved enterprise target regex to include missing
/enterprise/handle_consent_enrollment/{uuid}/course/ endpoint.
ENT-2710
2020-04-06 12:27:44 +05:00
edX Transifex Bot
662d735c64 fix(i18n): update translations 2020-04-05 17:29:23 -04:00
Awais Qureshi
887a612cc6 Merge pull request #23617 from edx/awais786/BOM-1491
BOM-1491
2020-04-05 21:43:38 +05:00
Awais Qureshi
ddfbbbc66b Merge pull request #23616 from edx/awais786/BOM-1490
BOM-1490
2020-04-05 21:42:52 +05:00
Awais Qureshi
789c621de9 Merge pull request #23615 from edx/awais786/BOM-1489
BOM-1489
2020-04-05 21:41:56 +05:00
Awais Qureshi
b55e8da882 BOM-1463
Adding missing aap.
2020-04-05 21:09:17 +05:00
Awais Qureshi
bdba07a1e2 BOM-1491
Group name
Changed in Django 2.2:
The max_length increased from 80 to 150 characters.
2020-04-04 21:48:42 +05:00
Awais Qureshi
9fc3dcb5d6 BOM-1490
None is not a valid value for posting.
2020-04-04 21:07:55 +05:00
Awais Qureshi
e66de4e49e BOM-1489
None is not a valid value for posting.
2020-04-04 19:52:18 +05:00
Adam Blackwell
ade9135c7f Merge pull request #23613 from edx/adzuci/dos-844-revert-prod-1395
Revert PROD-1395
2020-04-03 19:07:52 -04:00
Adam Blackwell
bb09c07c68 Revert "Certification verification enabled"
This reverts commit 3f1220276d.
2020-04-03 18:57:58 -04:00
Nicholas D'Alfonso
fe8d28bccf AA fix mobile reset dates banner 2020-04-03 15:22:50 -04:00
Saad Yousaf
dc6b98cbd0 Merge pull request #23598 from edx/saad/PROD-1287-investigation-logs
[PROD-1287] - Add investigation logs.
2020-04-03 21:45:22 +05:00
Waheed Ahmed
69181864cc Fix NoneType object has no attribute backend
We were passing unstripped password value to `authenticate_new_user()`
after creating a user which was resulting in password mismatch and
was raising this error.

PROD-656
2020-04-03 21:17:00 +05:00
SaadYousaf
738dbae563 add investigation logs. 2020-04-03 21:13:53 +05:00
Soban Javed
55cb859119 skip tests failing in django2.1 because app is deprecated 2020-04-03 20:36:26 +05:00
Dillon Dumesnil
cd1e5994d8 Merge pull request #23602 from edx/revert-23574-ddumesnil/lms-api-staff
Revert "Update the LMS courses API for staff permissions"
2020-04-03 07:46:11 -07:00
Simon Chen
6a2b3bdbee Add some feedback from edX Support to the Program Enrollment Inspector 2020-04-03 10:44:59 -04:00
Dillon Dumesnil
9b5ab66ace Revert "Update the LMS courses API for staff permissions" 2020-04-03 07:18:38 -07:00
Manjinder Singh
b45ac858ab Fixing django 2.1 probs in student management commands (#23587)
* Requiring at least one args in a mutually exclusive group to be set

bulk_change_enrollment requires one of agrs: org or course to be set
for it to function correctly.

* Creating new function to verify initial password hash

Starting with django 2.1, the function is_password_usable no longer checks whether encode
is a valid password created by a django hasher(hasher in  PASSWORD_HASHERS setting)

Adding this function to create constant behavior as we upgrade django versions
2020-04-03 09:55:07 -04:00
Uzair Rasheed
9fbae19057 Merge pull request #23544 from edx/refactor_bulk_unenroll
Refactor bulk unenroll mgmt cmd
2020-04-03 18:53:00 +05:00
edX Transifex Bot
30ebe42df8 geoip2: update maxmind geolite country database 2020-04-03 09:48:45 -04:00
Michael Terry
72e270982e Merge pull request #23599 from edx/mikix/upgrade-when
Upgrade edx-when to 1.2.0
2020-04-03 09:36:24 -04:00
Michael Terry
5deb18eab1 Upgrade edx-when to 1.2.0
This adds django admin access to its models.

AA-93
2020-04-03 09:12:00 -04:00
uzairr
4563b87236 Refactor bulk unenroll mgmt cmd
Bulk unenroll command is not supporting unenrolling all the learners
from multiple courses.This PR will enhance this mgmt cmd so that
it can support un-enrollment of learners from multiple courses.

PROD-1347
2020-04-03 17:50:28 +05:00
Nimisha Asthagiri
3a60ef0773 Merge pull request #23588 from edx/arch/django2-student-admin
Django2: student admin views permission fix
2020-04-03 08:38:34 -04:00
Ahtisham Shahid
40c83b49fb conflicts resolved
removed extra dependency
2020-04-03 16:22:24 +05:00
Ahtisham Shahid
9eaeb75df9 Merge pull request #23593 from edx/ahtisham/PROD-1295
updated xblock-poll version
2020-04-03 14:56:34 +05:00
Hammad Ahmad Waqas
7bd3900476 Merge pull request #23592 from edx/hammad/ENT-2740
ENT-2740 | Flaky tests due to UNIQUE constraint failed on enterprise_enterprisecourseenrollment.id
2020-04-03 14:22:06 +05:00