diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php index d107dcfdcad0bdc4f7ab4b61c711f5aac7b2796c..a49013a8de8c5d659dbf05eaed9c9e8d66ac9de4 100644 --- a/core/Plugin/Controller.php +++ b/core/Plugin/Controller.php @@ -546,6 +546,7 @@ abstract class Controller $view->debugTrackVisitsInsidePiwikUI = PiwikConfig::getInstance()->Debug['track_visits_inside_piwik_ui']; $view->isSuperUser = Access::getInstance()->hasSuperUserAccess(); $view->hasSomeAdminAccess = Piwik::isUserHasSomeAdminAccess(); + $view->hasSuperUserAccess = Piwik::hasUserSuperUserAccess(); $customLogo = new CustomLogo(); $view->isCustomLogo = $customLogo->isEnabled(); diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index edf60aae77c0e40aba26aa46864c81c0eb5977c0..3faa3e01bef4518485ec7d93ef7fbd046302ca60 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -97,7 +97,6 @@ class CoreHome extends \Piwik\Plugin $jsFiles[] = "plugins/CoreHome/javascripts/services/service.js"; $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik-service.js"; $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik-api-service.js"; - $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik-access-service.js"; $jsFiles[] = "plugins/CoreHome/javascripts/services/websitegroups-service.js"; $jsFiles[] = "plugins/CoreHome/javascripts/filters/filter.js"; diff --git a/plugins/CoreHome/javascripts/services/piwik-access-service.js b/plugins/CoreHome/javascripts/services/piwik-access-service.js deleted file mode 100644 index abc2139207cfe663d82db7cd162c5937b5bfa4c0..0000000000000000000000000000000000000000 --- a/plugins/CoreHome/javascripts/services/piwik-access-service.js +++ /dev/null @@ -1,22 +0,0 @@ -/*! - * Piwik - Web Analytics - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -angular.module('piwikApp.service').service('piwikAccess', function(piwikApi){ - - this.hasSuperUserAccess = false; - - this.fetchHasSuperUserAccess = function () { - var that = this; - - piwikApi.fetch({method: 'UsersManager.hasSuperUserAccess'}).then(function (response) { - if (response && response.value) { - that.hasSuperUserAccess = response.value; - } - return response; - }); - } -}); \ No newline at end of file diff --git a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig index 8e6980828be77cc4a0e9357d3e20b112bb178a8d..e77734225825730f87bd506e0c3600afaa3090fa 100644 --- a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig +++ b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig @@ -29,6 +29,7 @@ {% endif %} {% if language is defined %}piwik.language = "{{ language }}";{% endif %} + piwik.hasSuperUserAccess = {{ hasSuperUserAccess|default(0)|e('js')}}; piwik.config = {}; {% if clientSideConfig is defined %} piwik.config = {{ clientSideConfig|json_encode|raw }};