Ensure site is selected in siteselector if only one site is available (#17349)

2 files changed, 6 insertions, 2 deletions

diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js b/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js
index fb25fb5176..d467365511 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js
@@ -122,7 +122,7 @@
                 return;
             }
 
-            searchSite('%').then(function () {
+            return searchSite('%').then(function () {
                 initialSites = model.sites;
                 model.isInitialized = true
             });
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js b/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js
index 1e0d16344c..8c5760a295 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.controller.js
@@ -13,7 +13,11 @@
 
         $scope.model = siteSelectorModel;
 
-        $scope.model.loadInitialSites();
+        $scope.model.loadInitialSites().then(function(){
+            if (!$scope.selectedSite && !$scope.model.hasMultipleSites() && $scope.model.sites[0]) {
+                $scope.selectedSite = {id: $scope.model.sites[0].idsite, name: $scope.model.sites[0].name};
+            }
+        });
 
         $scope.autocompleteMinSites = AUTOCOMPLETE_MIN_SITES;
         $scope.activeSiteId = piwik.idSite;