From a031bf95871d3e13935aa752fe227e4ceb23a454 Mon Sep 17 00:00:00 2001 From: Gabe Mulley Date: Wed, 15 Nov 2017 12:56:14 -0500 Subject: [PATCH] extract tracking_id logic into a method --- openedx/core/djangoapps/schedules/tracking.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/openedx/core/djangoapps/schedules/tracking.py b/openedx/core/djangoapps/schedules/tracking.py index fa34052f45..616754933d 100644 --- a/openedx/core/djangoapps/schedules/tracking.py +++ b/openedx/core/djangoapps/schedules/tracking.py @@ -87,10 +87,7 @@ class GoogleAnalyticsTrackingPixel(object): parameter_name = attribute.metadata['param_name'] parameters[parameter_name] = str(value) - tracking_id = get_config_value_from_site_or_settings("GOOGLE_ANALYTICS_ACCOUNT", site=self.site) - if tracking_id is None: - tracking_id = get_config_value_from_site_or_settings("GOOGLE_ANALYTICS_TRACKING_ID", site=self.site) - + tracking_id = self._get_tracking_id() if tracking_id is None: return None @@ -106,3 +103,9 @@ class GoogleAnalyticsTrackingPixel(object): parameters[param_name] = unicode(self.course_id) return u"https://www.google-analytics.com/collect?{params}".format(params=urlencode(parameters)) + + def _get_tracking_id(self): + tracking_id = get_config_value_from_site_or_settings("GOOGLE_ANALYTICS_ACCOUNT", site=self.site) + if tracking_id is None: + tracking_id = get_config_value_from_site_or_settings("GOOGLE_ANALYTICS_TRACKING_ID", site=self.site) + return tracking_id