From 4813df02a3fc3561a3da09dacafc11383ac805d8 Mon Sep 17 00:00:00 2001 From: Matt Tuchfarber Date: Thu, 13 Jul 2017 15:55:48 -0400 Subject: [PATCH] Fix WL sites from causing multiple zendesk emails WL-1109. Currently the system is using org filters to tag zendesk tickets. MITxPro uses both MITxPro and MITProfessionalX org filters to pull courses from both orgs. This is causing multiple emails to be sent from Zendesk as they are getting tagged with both whitelabel_MITProfessionalX and whitelabel_MITxPRO. This fix changes to using SITE_NAME instead. --- common/djangoapps/util/tests/test_submit_feedback.py | 2 +- common/djangoapps/util/views.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/djangoapps/util/tests/test_submit_feedback.py b/common/djangoapps/util/tests/test_submit_feedback.py index 8323f10c49..2f963dfc94 100644 --- a/common/djangoapps/util/tests/test_submit_feedback.py +++ b/common/djangoapps/util/tests/test_submit_feedback.py @@ -294,7 +294,7 @@ class SubmitFeedbackTest(EnterpriseServiceMockMixin, TestCase): email=fields["email"], subject=fields["subject"], details=fields["details"], - tags=[fields["issue_type"], "LMS", "whitelabel_{}".format(fake_get_value("course_org_filter"))] + tags=[fields["issue_type"], "LMS", "site_name_{}".format(fake_get_value("SITE_NAME").replace(".", "_"))] ) ticket_update = self._build_zendesk_ticket_update(TEST_REQUEST_HEADERS) diff --git a/common/djangoapps/util/views.py b/common/djangoapps/util/views.py index 8b9166ccfe..48763c00d9 100644 --- a/common/djangoapps/util/views.py +++ b/common/djangoapps/util/views.py @@ -299,10 +299,10 @@ def _record_feedback_in_zendesk( zendesk_tags = list(tags.values()) + ["LMS"] # Per edX support, we would like to be able to route feedback items by site via tagging - current_site_orgs = configuration_helpers.get_current_site_orgs() - if current_site_orgs: - for org in current_site_orgs: - zendesk_tags.append("whitelabel_{org}".format(org=org)) + current_site_name = configuration_helpers.get_value("SITE_NAME") + if current_site_name: + current_site_name = current_site_name.replace(".", "_") + zendesk_tags.append("site_name_{site}".format(site=current_site_name)) new_ticket = { "ticket": {