From 95a89155460fc7494a1b1d22267052033b9330ea Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 18 Dec 2013 18:16:32 -0500 Subject: [PATCH] Temporarily disable Google Analytics until such time as angulartics supports multiple providers --- static/js/app.js | 18 ++++++++++-------- templates/base.html | 3 ++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/static/js/app.js b/static/js/app.js index 09a49eb51..234a361cd 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -89,7 +89,7 @@ function getMarkedDown(string) { } // Start the application code itself. -quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', 'angulartics.google.analytics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide, cfpLoadingBarProvider) { +quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', /*'angulartics.google.analytics',*/ 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide, cfpLoadingBarProvider) { cfpLoadingBarProvider.includeSpinner = false; $provide.factory('CookieService', ['$cookies', '$cookieStore', function($cookies, $cookieStore) { @@ -286,13 +286,15 @@ quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'rest if (UserService.currentUser().anonymous) { return; } - - planService.isBusinessPlan(planId, function(bus) { - if (bus) { - document.location = '/organizations/new/?plan=' + planId; - } else { - document.location = '/user?plan=' + planId; - } + + planService.getPlan(planId, function(plan) { + planService.isBusinessPlan(planId, function(bus) { + if (bus) { + document.location = '/organizations/new/?plan=' + planId; + } else { + document.location = '/user?plan=' + planId; + } + }); }); }); }; diff --git a/templates/base.html b/templates/base.html index ac8455bed..de2578ce7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -78,6 +78,7 @@ b._i.push([a,e,d])};b.__SV=1.2}})(document,window.mixpanel||[]); mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8cc7cc29c869f9", { track_pageview : false, debug: !isProd });