Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13684 from edx/student_cleanup/decoupled_dependencies

Browse Source 
Decouple student's dependency on badges with django signals
This commit is contained in:
Nimisha Asthagiri
2016-10-07 13:44:11 -04:00
committed by GitHub
parent 2112e7f8c8 1717e0c4f6
commit 010f7eb5c8
5 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/djangoapps/student/models.py
View File

@@ -47,7 +47,6 @@ from simple_history.models import HistoricalRecords
from track import contexts
from openedx.core.djangoapps.xmodule_django.models import CourseKeyField, NoneToEmptyManager
from lms.djangoapps.badges.utils import badges_enabled
from certificates.models import GeneratedCertificate
from course_modes.models import CourseMode
from enrollment.api import _default_course_mode
@@ -1297,9 +1296,7 @@ class CourseEnrollment(models.Model):
# User is allowed to enroll if they've reached this point.
enrollment = cls.get_or_create_enrollment(user, course_key)
enrollment.update_enrollment(is_active=True, mode=mode)
if badges_enabled():
from lms.djangoapps.badges.events.course_meta import award_enrollment_badge
award_enrollment_badge(user)
enrollment.send_signal(EnrollStatusChange.enroll)
return enrollment

3
common/djangoapps/student/views.py
View File

@@ -1079,8 +1079,7 @@ def change_enrollment(request, check_access=True):
try:
enroll_mode = CourseMode.auto_enroll_mode(course_id, available_modes)
if enroll_mode:
enrollment = CourseEnrollment.enroll(user, course_id, check_access=check_access, mode=enroll_mode)
enrollment.send_signal(EnrollStatusChange.enroll)
CourseEnrollment.enroll(user, course_id, check_access=check_access, mode=enroll_mode)
except Exception: # pylint: disable=broad-except
return HttpResponseBadRequest(_("Could not enroll"))