fixes #4885 all websites dashboard should use number sort again

matomo-org · May 5, 2014 · 4b6e77f · 4b6e77f
1 parent a4b4f89
commit 4b6e77f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-model.js b/plugins/MultiSites/angularjs/dashboard/dashboard-model.js
@@ -93,6 +93,10 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
             site.idsite   = reportMetadata[index].idsite;
             site.group    = reportMetadata[index].group;
             site.main_url = reportMetadata[index].main_url;
+            // casting evolution to int fixes sorting, see: http://dev.piwik.org/trac/ticket/4885
+            site.visits_evolution    = parseInt(site.visits_evolution);
+            site.pageviews_evolution = parseInt(site.pageviews_evolution);
+            site.revenue_evolution   = parseInt(site.revenue_evolution);
 
             if (site.group) {
 

diff --git a/plugins/MultiSites/angularjs/site/site-directive.js b/plugins/MultiSites/angularjs/site/site-directive.js
@@ -35,7 +35,6 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document,
 
             $scope.period   = piwik.period;
             $scope.date     = piwik.broadcast.getValueFromUrl('date');
-            $scope.parseInt = parseInt;
 
             this.getWebsite = function () {
                 return $scope.website;

diff --git a/plugins/MultiSites/angularjs/site/site.html b/plugins/MultiSites/angularjs/site/site.html
@@ -22,9 +22,9 @@
 
     <td ng-if="period != 'range'" style="width:170px;">
         <div class="visits" ng-if="!website.isGroup">
-            <span ng-show="parseInt(website[evolutionMetric]) > 0"><img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <span style="color: green;">{{ website[evolutionMetric] }}&nbsp;</span></span>
-            <span ng-show="parseInt(website[evolutionMetric]) == 0"><img src="plugins/MultiSites/images/stop.png" alt="" /> <span>{{ website[evolutionMetric] }}</span></span>
-            <span ng-show="parseInt(website[evolutionMetric]) < 0"><img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <span style="color: red;">{{ website[evolutionMetric] }}&nbsp;</span></span>
+            <span ng-show="website[evolutionMetric] > 0"><img src="plugins/MultiSites/images/arrow_up.png" alt="" /> <span style="color: green;">{{ website[evolutionMetric] }}%&nbsp;</span></span>
+            <span ng-show="website[evolutionMetric] == 0"><img src="plugins/MultiSites/images/stop.png" alt="" /> <span>{{ website[evolutionMetric] }}%</span></span>
+            <span ng-show="website[evolutionMetric] < 0"><img src="plugins/MultiSites/images/arrow_down.png" alt="" /> <span style="color: red;">{{ website[evolutionMetric] }}%&nbsp;</span></span>
         </div>
     </td>