Merge pull request getredash#130 from EverythingMe/fix_category_chart…

…_sorting Fix: (in category charts) don't sort values when there is more than one category
hailocab · Mar 11, 2014 · 7d9a7ea · 7d9a7ea
2 parents 81525fa + 97b727d
commit 7d9a7ea
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/rd_ui/app/scripts/ng-highchart.js b/rd_ui/app/scripts/ng-highchart.js
@@ -225,12 +225,16 @@
                                     // TODO: move this logic to Query#getChartData
                                     var yValues = _.groupBy(s.data, 'x');
 
-                                    var newData = _.sortBy(_.map(categories, function (category) {
+                                    var newData = _.map(categories, function (category) {
                                         return {
                                             name: category,
                                             y: yValues[category] && yValues[category][0].y
                                         }
-                                    }), 'y').reverse();
+                                    });
+
+                                    if (categories.length == 1) {
+                                        newData = _.sortBy(newData, 'y').reverse();
+                                    };
 
                                     s.data = newData;
                                 });