Skip to content

Commit

Permalink
Removed condition to check if values are returned for queries so that…
Browse files Browse the repository at this point in the history
… the admin ui displays the same results as cli.

Fixes #4688
  • Loading branch information
Vidhuran committed Mar 11, 2016
1 parent 156cc5e commit 90b9291
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
- [#5937](https://github.com/influxdata/influxdb/pull/5937): Rewrite SHOW SERIES to use query engine
- [#5949](https://github.com/influxdata/influxdb/issues/5949): Return error message when improper types are used in SELECT
- [#5963](https://github.com/influxdata/influxdb/pull/5963): Fix possible deadlock
- [#4688](https://github.com/influxdata/influxdb/issues/4688): admin UI doesn't display results for some SHOW queries

## v0.10.2 [2016-03-03]

Expand Down
20 changes: 5 additions & 15 deletions services/admin/assets/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,21 +180,11 @@ var handleSubmit = function(e) {
return
}

var values = series[0].values;

if ((values == null) || (values.length == 0)) {
showQueryError("Query returned no results!");
} else {
availableDatabases = values.map(function(value) {
return value[0];
});

hideDatabaseWarning();
React.render(
React.createElement(DataTable, {series: series}),
document.getElementById('table')
);
}
hideDatabaseWarning();
React.render(
React.createElement(DataTable, {series: series}),
document.getElementById('table')
);
});

if (e != null) { e.preventDefault(); }
Expand Down
2 changes: 1 addition & 1 deletion services/admin/statik/statik.go

Large diffs are not rendered by default.

0 comments on commit 90b9291

Please sign in to comment.