Skip to content
Extraits de code Groupes Projets
Valider d61d53c0 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

make sure config works in admin ui

parent b25bc6b8
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -507,8 +507,6 @@ abstract class Controller ...@@ -507,8 +507,6 @@ abstract class Controller
$language = LanguagesManager::getLanguageForSession(); $language = LanguagesManager::getLanguageForSession();
$view->language = !empty($language) ? $language : LanguagesManager::getLanguageCodeForCurrentUser(); $view->language = !empty($language) ? $language : LanguagesManager::getLanguageCodeForCurrentUser();
$view->clientSideConfig = PiwikConfig::getInstance()->getClientSideOptions();
$this->setBasicVariablesView($view); $this->setBasicVariablesView($view);
$view->topMenu = MenuTop::getInstance()->getMenu(); $view->topMenu = MenuTop::getInstance()->getMenu();
...@@ -544,6 +542,7 @@ abstract class Controller ...@@ -544,6 +542,7 @@ abstract class Controller
*/ */
protected function setBasicVariablesView($view) protected function setBasicVariablesView($view)
{ {
$view->clientSideConfig = PiwikConfig::getInstance()->getClientSideOptions();
$view->debugTrackVisitsInsidePiwikUI = PiwikConfig::getInstance()->Debug['track_visits_inside_piwik_ui']; $view->debugTrackVisitsInsidePiwikUI = PiwikConfig::getInstance()->Debug['track_visits_inside_piwik_ui'];
$view->isSuperUser = Access::getInstance()->hasSuperUserAccess(); $view->isSuperUser = Access::getInstance()->hasSuperUserAccess();
$view->hasSomeAdminAccess = Piwik::isUserHasSomeAdminAccess(); $view->hasSomeAdminAccess = Piwik::isUserHasSomeAdminAccess();
......
var piwikAppConfig = angular.module('piwikApp.config', []); var piwikAppConfig = angular.module('piwikApp.config', []);
(function () { (function () {
// we probably want this later as a separate config file, till then it serves as a "bridge"
for (var index in piwik.config) { for (var index in piwik.config) {
piwikAppConfig.constant(index.toUpperCase(), piwik.config[index]) piwikAppConfig.constant(index.toUpperCase(), piwik.config[index])
}; };
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter