move site-events UI behind waffle-flag

mozilla · Jan 26, 2012 · 1fb4010 · 1fb4010
1 parent cd37ff0
commit 1fb4010
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/apps/stats/templates/stats/stats.html b/apps/stats/templates/stats/stats.html
@@ -2,7 +2,10 @@
 
 {% set range = view.range %}
 
-{% block bodyclass %}statistics{% endblock %}
+{% block bodyclass %}
+  statistics
+  {{ 'waffle-site-events' if waffle.switch('site-events') else '' }}
+{% endblock %}
 
 {% block extrahead %}
   {{ css('zamboni/stats') }}

diff --git a/media/js/impala/stats/manager.js b/media/js/impala/stats/manager.js
@@ -22,6 +22,7 @@ z.StatsManager = (function() {
         addonId         = parseInt($(".primary").attr("data-addon_id"), 10),
         baseURL         = $(".primary").attr("data-base_url"),
         pendingFetches  = 0,
+        siteEventsEnabled = $('body').hasClass('waffle-site-events'),
         writeInterval   = false;
 
     // It's a bummer, but we need to know which metrics have breakdown fields.
@@ -102,14 +103,14 @@ z.StatsManager = (function() {
         // Update our internal view state.
         currentView = $.extend(currentView, newView);
         // Fetch the data from the server or storage, and notify other components.
-        $.when( getDataRange(currentView) )
+        $.when( getDataRange(currentView), getSiteEvents(currentView) )
          .then( function(data, events) {
             setTimeout(function() {
                 $(window).trigger("dataready", {
                     'view'  : currentView,
                     'fields': getAvailableFields(currentView),
                     'data'  : data,
-                    'events': [] //TODO potch fix this when site events are re-enabled.
+                    'events': events
                 });
             }, 0);
         });
@@ -119,6 +120,7 @@ z.StatsManager = (function() {
 
     // Retrieves a list of site-wide events that may impact statistics data.
     function getSiteEvents(view) {
+        if (!siteEventsEnabled) return [];
         var range = normalizeRange(view.range),
             urlStart = Highcharts.dateFormat('%Y%m%d', range.start),
             urlEnd = Highcharts.dateFormat('%Y%m%d', range.end),

diff --git a/migrations/299-site-events-waffle.sql b/migrations/299-site-events-waffle.sql
@@ -0,0 +1 @@
+INSERT INTO waffle_switch (name, active) VALUES ('site-events', 0);