fixes #4853 sparklines in all websites dashboard were not working

matomo-org · Mar 17, 2014 · d75e2f8 · d75e2f8
1 parent a6963a9
commit d75e2f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -66,6 +66,7 @@ <h2>
                 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">
             </tr>

diff --git 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()));
             }
         }
     }