Display results of multiple queries in Admin UI, Not just the first q…

…uery. Fixes #3503
influxdata · Feb 21, 2016 · d6f3628 · d6f3628
1 parent c1de263
commit d6f3628
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - [#5336](https://github.com/influxdata/influxdb/pull/5366): Enabled golint for influxql. @gabelev
 - [#5706](https://github.com/influxdata/influxdb/pull/5706): Cluster setup cleanup
 - [#5691](https://github.com/influxdata/influxdb/pull/5691): Remove associated shard data when retention policies are dropped.
+- [#5737](https://github.com/influxdata/influxdb/pull/5737): Admin UI: Display results of multiple queries, not just the first query.
 
 ### Bugfixes
 

diff --git a/services/admin/assets/js/admin.js b/services/admin/assets/js/admin.js
@@ -31,7 +31,12 @@ var connectionString = function() {
 }
 
 var getSeriesFromJSON = function(data) {
-    var results = data.results[0].series;
+    var results = [];
+    data.results.forEach(function(result) {
+        result.series.forEach(function(s) {
+            results.push(s);
+        });
+    });
     return results;
 }
 

diff --git a/services/admin/statik/statik.go b/services/admin/statik/statik.go