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

fix: add missing context for discussion events

Browse Source
This commit is contained in:
SaadYousaf
2022-09-28 14:46:05 +05:00
committed by Saad Yousaf
parent 6aca8abe87
commit 8ecb39826a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/djangoapps/discussion/django_comment_client/base/views.py
View File

@@ -5,8 +5,6 @@ import logging
import random import random
import time import time
import eventtracking
import six import six
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user
@@ -16,11 +14,13 @@ from django.utils.translation import gettext as _
from django.views.decorators import csrf from django.views.decorators import csrf
from django.views.decorators.clickjacking import xframe_options_exempt from django.views.decorators.clickjacking import xframe_options_exempt
from django.views.decorators.http import require_GET, require_POST from django.views.decorators.http import require_GET, require_POST
from eventtracking import tracker
from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.keys import CourseKey
import lms.djangoapps.discussion.django_comment_client.settings as cc_settings import lms.djangoapps.discussion.django_comment_client.settings as cc_settings
import openedx.core.djangoapps.django_comment_common.comment_client as cc import openedx.core.djangoapps.django_comment_common.comment_client as cc
from common.djangoapps.util.file import store_uploaded_file from common.djangoapps.util.file import store_uploaded_file
from common.djangoapps.track import contexts
from lms.djangoapps.courseware.access import has_access from lms.djangoapps.courseware.access import has_access
from lms.djangoapps.courseware.courses import get_course_overview_with_access, get_course_with_access from lms.djangoapps.courseware.courses import get_course_overview_with_access, get_course_with_access
from lms.djangoapps.courseware.exceptions import CourseAccessRedirect from lms.djangoapps.courseware.exceptions import CourseAccessRedirect
@@ -92,7 +92,9 @@ def track_forum_event(request, event_name, course, obj, data, id_map=None):
role.role for role in user.courseaccessrole_set.filter(course_id=course.id) role.role for role in user.courseaccessrole_set.filter(course_id=course.id)
] ]
eventtracking.tracker.emit(event_name, data) context = contexts.course_context_from_course_id(course.id)
with tracker.get_tracker().context(event_name, context):
tracker.emit(event_name, data)
def track_created_event(request, event_name, course, obj, data): def track_created_event(request, event_name, course, obj, data):

2
lms/djangoapps/discussion/tests/test_views.py
View File

@@ -2186,7 +2186,7 @@ class ThreadViewedEventTestCase(EventTestMixin, ForumsEnableMixin, UrlResetMixin
@patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True}) @patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
def setUp(self): # pylint: disable=arguments-differ def setUp(self): # pylint: disable=arguments-differ
super().setUp('eventtracking.tracker') super().setUp('lms.djangoapps.discussion.django_comment_client.base.views.tracker')
self.course = CourseFactory.create( self.course = CourseFactory.create(
teams_configuration=TeamsConfig({ teams_configuration=TeamsConfig({