From 59910320fe4b3f7e5474bf11bc12c2d34e96ca18 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Wed, 22 Aug 2018 15:29:25 +0100 Subject: [PATCH 1/2] Basic controller for account merge checker --- services/web/public/coffee/main.coffee | 1 + services/web/public/coffee/main/account-merge-checker.coffee | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 services/web/public/coffee/main/account-merge-checker.coffee diff --git a/services/web/public/coffee/main.coffee b/services/web/public/coffee/main.coffee index fc62c6bc38..39c1de445e 100644 --- a/services/web/public/coffee/main.coffee +++ b/services/web/public/coffee/main.coffee @@ -24,6 +24,7 @@ define [ "main/affiliations/controllers/UserAffiliationsController" "main/affiliations/factories/UserAffiliationsDataService" "main/keys" + "main/account-merge-checker" "main/cms/index" "analytics/AbTestingManager" "directives/asyncForm" diff --git a/services/web/public/coffee/main/account-merge-checker.coffee b/services/web/public/coffee/main/account-merge-checker.coffee new file mode 100644 index 0000000000..ef461960f3 --- /dev/null +++ b/services/web/public/coffee/main/account-merge-checker.coffee @@ -0,0 +1,5 @@ +define [ + "base" +], (App) -> + App.controller "AccountMergeCheckerController", ($scope) -> + $scope.hasOlAccount = true From 1fb047132769959dd8ee4b822443eac34dfe38c3 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Thu, 23 Aug 2018 15:11:31 +0100 Subject: [PATCH 2/2] Don't default to having OL account in account checker --- services/web/public/coffee/main/account-merge-checker.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/main/account-merge-checker.coffee b/services/web/public/coffee/main/account-merge-checker.coffee index ef461960f3..caeb3011ca 100644 --- a/services/web/public/coffee/main/account-merge-checker.coffee +++ b/services/web/public/coffee/main/account-merge-checker.coffee @@ -2,4 +2,4 @@ define [ "base" ], (App) -> App.controller "AccountMergeCheckerController", ($scope) -> - $scope.hasOlAccount = true + $scope.hasOlAccount = null