Use the standard enrollment table instead of a custom CCX table for CCX
enrollments. The goal for this PR is to have a single mechanism for registering users and reducing the number of places where special-casing for ccx courses is needed. The migration at this point is purposefully limited to convert ccx memberships into student enrollments when moving forward. No backward migration is in place at the moment. The ccx membership tables are not removed at this time. It is possible to go backwards and forwards multiple times with no errors or data loss.
This commit is contained in:
@@ -1196,12 +1196,6 @@ class CourseEnrollment(models.Model):
|
||||
if not user.is_authenticated():
|
||||
return False
|
||||
|
||||
# unwrap CCXLocators so that we use the course as the access control
|
||||
# source
|
||||
from ccx_keys.locator import CCXLocator
|
||||
if isinstance(course_key, CCXLocator):
|
||||
course_key = course_key.to_course_locator()
|
||||
|
||||
try:
|
||||
record = CourseEnrollment.objects.get(user=user, course_id=course_key)
|
||||
return record.is_active
|
||||
|
||||
@@ -655,13 +655,6 @@ def dashboard(request):
|
||||
)
|
||||
courses_requirements_not_met = get_pre_requisite_courses_not_completed(user, courses_having_prerequisites)
|
||||
|
||||
ccx_membership_triplets = []
|
||||
if settings.FEATURES.get('CUSTOM_COURSES_EDX', False):
|
||||
from ccx.utils import get_ccx_membership_triplets
|
||||
ccx_membership_triplets = get_ccx_membership_triplets(
|
||||
user, course_org_filter, org_filter_out_set
|
||||
)
|
||||
|
||||
if 'notlive' in request.GET:
|
||||
redirect_message = _("The course you are looking for does not start until {date}.").format(
|
||||
date=request.GET['notlive']
|
||||
@@ -697,7 +690,6 @@ def dashboard(request):
|
||||
'provider_states': [],
|
||||
'order_history_list': order_history_list,
|
||||
'courses_requirements_not_met': courses_requirements_not_met,
|
||||
'ccx_membership_triplets': ccx_membership_triplets,
|
||||
'nav_hidden': True,
|
||||
}
|
||||
|
||||
@@ -1904,16 +1896,6 @@ def activate_account(request, key):
|
||||
manual_enrollment_audit.reason, enrollment
|
||||
)
|
||||
|
||||
# enroll student in any pending CCXs he/she may have if auto_enroll flag is set
|
||||
if settings.FEATURES.get('CUSTOM_COURSES_EDX'):
|
||||
from ccx.models import CcxMembership, CcxFutureMembership
|
||||
ccxfms = CcxFutureMembership.objects.filter(
|
||||
email=student[0].email
|
||||
)
|
||||
for ccxfm in ccxfms:
|
||||
if ccxfm.auto_enroll:
|
||||
CcxMembership.auto_enroll(student[0], ccxfm)
|
||||
|
||||
resp = render_to_response(
|
||||
"registration/activation_complete.html",
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user