fixes #5817 all websites dashboard was not selected in user settings although...

fixes #5817 all websites dashboard was not selected in user settings although the value was stored correct

plugins/UsersManager/Controller.php

@@ -210,22 +210,27 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         $view->userEmail = $user['email'];
 
         $userPreferences = new UserPreferences();
-        $defaultReport = $userPreferences->getDefaultWebsiteId();
+        $defaultReport   = $userPreferences->getDefaultReport();
+
         if ($defaultReport === false) {
-            $defaultReport = $this->getDefaultWebsiteId();
+            $defaultReport = $userPreferences->getDefaultWebsiteId();
         }
+
         $view->defaultReport = $defaultReport;
 
         if ($defaultReport == 'MultiSites') {
 
-            $userPreferences = new UserPreferences();
-            $view->defaultReportSiteName = Site::getNameFor($userPreferences->getDefaultWebsiteId());
+            $defaultSiteId = $userPreferences->getDefaultWebsiteId();
+
+            $view->defaultReportIdSite   = $defaultSiteId;
+            $view->defaultReportSiteName = Site::getNameFor($defaultSiteId);
         } else {
+            $view->defaultReportIdSite   = $defaultReport;
             $view->defaultReportSiteName = Site::getNameFor($defaultReport);
         }
 
         $view->defaultDate = $this->getDefaultDateForUser($userLogin);
-        $view-> availableDefaultDates = $this->getDefaultDates();
+        $view->availableDefaultDates = $this->getDefaultDates();
 
         $view->languages = APILanguagesManager::getInstance()->getAvailableLanguageNames();
         $view->currentLanguageCode = LanguagesManager::getLanguageCodeForCurrentUser();
@@ -237,15 +242,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         return $view->render();
     }
 
-    protected function getDefaultWebsiteId()
-    {
-        $sitesId = \Piwik\Plugins\SitesManager\API::getInstance()->getSitesIdWithAdminAccess();
-        if (!empty($sitesId)) {
-            return $sitesId[0];
-        }
-        return false;
-    }
-
     public function setIgnoreCookie()
     {
         Piwik::checkUserHasSomeViewAccess();

plugins/UsersManager/UserPreferences.php

@@ -25,22 +25,41 @@ class UserPreferences
      */
     public function getDefaultWebsiteId()
     {
-        $defaultWebsiteId = false;
+        $defaultReport = $this->getDefaultReport();
 
-        // User preference: default website ID to load
-        $defaultReport = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT);
-        if (is_numeric($defaultReport)) {
-            $defaultWebsiteId = $defaultReport;
-        }
-
-        if ($defaultWebsiteId && Piwik::isUserHasViewAccess($defaultWebsiteId)) {
-            return $defaultWebsiteId;
+        if (is_numeric($defaultReport) && Piwik::isUserHasViewAccess($defaultReport)) {
+            return $defaultReport;
         }
 
         $sitesId = APISitesManager::getInstance()->getSitesIdWithAtLeastViewAccess();
+
         if (!empty($sitesId)) {
             return $sitesId[0];
         }
+
+        return false;
+    }
+    /**
+     * Returns default site ID that Piwik should load.
+     *
+     * _Note: This value is a Piwik setting set by each user._
+     *
+     * @return bool|int
+     * @api
+     */
+    public function getDefaultReport()
+    {
+        // User preference: default website ID to load
+        $defaultReport = APIUsersManager::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), APIUsersManager::PREFERENCE_DEFAULT_REPORT);
+
+        if (!is_numeric($defaultReport)) {
+            return $defaultReport;
+        }
+
+        if ($defaultReport && Piwik::isUserHasViewAccess($defaultReport)) {
+            return $defaultReport;
+        }
+
         return false;
     }
 

plugins/UsersManager/templates/userSettings.twig

@@ -52,11 +52,6 @@
                 <input id="defaultReportSpecific" type="radio" value="1"
                        name="defaultReport"{% if defaultReport != 'MultiSites' %} checked="checked"{% endif %} />
                 <label for="defaultReportSpecific" style="padding-right:12px;">{{ 'General_DashboardForASpecificWebsite'|translate }}</label>
-                {% if defaultReport=='MultiSites' %}
-                    {% set defaultReportIdSite=1 %}
-                {% else %}
-                    {% set defaultReportIdSite=defaultReport %}
-                {% endif %}
 
                 <div piwik-siteselector
                      class="sites_autocomplete"