Create dashboard settings base control and use with new dashboard manager control, fix regression in dashboard menu handling (menu would not rebuild on dashboard rename/remove/create), remove use of id attribute in _dashboardSettings.twig, fix z-index regression in dashboard settings popup in morpheus.

1 files changed, 3 insertions, 4 deletions

diff --git a/core/View.php b/core/View.php
index 3b5dd03985..c3f45c65c1 100644
--- a/core/View.php
+++ b/core/View.php
@@ -135,6 +135,8 @@ class View implements ViewInterface
 
         $this->piwik_version = Version::VERSION;
         $this->piwikUrl = Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName());
+        $this->userLogin = Piwik::getCurrentUserLogin();
+        $this->isSuperUser = Access::getInstance()->hasSuperUserAccess(); // TODO: redundancy w/ userIsSuperUser
     }
 
     /**
@@ -200,9 +202,6 @@ class View implements ViewInterface
         try {
             $this->currentModule = Piwik::getModule();
             $this->currentAction = Piwik::getAction();
-            $userLogin = Piwik::getCurrentUserLogin();
-            $this->userLogin = $userLogin;
-            $this->isSuperUser = Access::getInstance()->hasSuperUserAccess();
 
             $count = SettingsPiwik::getWebsitesCountToDisplay();
 
@@ -226,7 +225,7 @@ class View implements ViewInterface
 
             $this->loginModule = Piwik::getLoginPluginName();
 
-            $user = APIUsersManager::getInstance()->getUser($userLogin);
+            $user = APIUsersManager::getInstance()->getUser($this->userLogin);
             $this->userAlias = $user['alias'];
         } catch (Exception $e) {
             // can fail, for example at installation (no plugin loaded yet)