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

Merge pull request #15564 from edx/tuchfarber/wl-1109_zendesk

Browse Source 
Fix WL sites from causing multiple zendesk emails
This commit is contained in:
Douglas Hall
2017-07-17 13:40:50 -04:00
committed by GitHub
parent 31039ab504 4813df02a3
commit 33b1e7ca1b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/djangoapps/util/tests/test_submit_feedback.py
View File

@@ -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)

8
common/djangoapps/util/views.py
View File

@@ -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": {