diff --git a/core/CliMulti/Process.php b/core/CliMulti/Process.php index fe30c6d0e0c..f8a7ff5c2d3 100644 --- a/core/CliMulti/Process.php +++ b/core/CliMulti/Process.php @@ -142,6 +142,7 @@ private function writePidFileContent($content) public static function isSupported() { + return false; if (SettingsServer::isWindows()) { return false; } diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.html b/plugins/MultiSites/angularjs/dashboard/dashboard.html index 273e1564518..0eba760b983 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.html @@ -66,6 +66,7 @@

piwik-multisites-site date-sparkline="dateSparkline" show-sparklines="showSparklines" + metric="predicate" display-revenue-column="displayRevenueColumn" ng-repeat="website in model.sites | orderBy:predicate:reverse | multiSitesGroupFilter:model.getCurrentPagingOffsetStart():model.pageSize"> diff --git a/plugins/MultiSites/angularjs/site/site-directive.js b/plugins/MultiSites/angularjs/site/site-directive.js index d118a09889a..7cda35482ea 100644 --- a/plugins/MultiSites/angularjs/site/site-directive.js +++ b/plugins/MultiSites/angularjs/site/site-directive.js @@ -27,7 +27,8 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document, evolutionMetric: '=', showSparklines: '=', dateSparkline: '=', - displayRevenueColumn: '=' + displayRevenueColumn: '=', + metric: '=' }, templateUrl: 'plugins/MultiSites/angularjs/site/site.html?cb=' + piwik.cacheBuster, controller: function ($scope) { @@ -47,7 +48,7 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document, append = '&token_auth=' + token_auth; } - return piwik.piwik_url + '?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' +$scope.evolutionMetric + '&columns=' + $scope.evolutionMetric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors())); + return piwik.piwik_url + '?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' +$scope.metric + '&columns=' + $scope.metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors())); } } }