From 3020071fe46ba02ed06a4e0e2ff27bd5f7750cde Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Wed, 27 Jul 2016 14:15:22 +0200 Subject: [PATCH] Provider argument for setup is never used --- webadmin/src/js/main.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/webadmin/src/js/main.js b/webadmin/src/js/main.js index 0682e94f7..55e2076e5 100644 --- a/webadmin/src/js/main.js +++ b/webadmin/src/js/main.js @@ -64,14 +64,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route', Client.logout(); }; - $scope.setup = function (provider) { - if (provider === 'caas') { - window.location.href = '/error.html?errorCode=1'; - } else { - window.location.href = '/setup.html'; - } - }; - $scope.error = function (error) { console.error(error); window.location.href = '/error.html'; @@ -111,7 +103,11 @@ angular.module('Application').controller('MainController', ['$scope', '$route', Client.getStatus(function (error, status) { if (error) return $scope.error(error); - if (!status.activated) return $scope.setup(); + + if (!status.activated) { + window.location.href = '/setup.html'; + return; + } Client.refreshConfig(function (error) { if (error) return $scope.error(error);