opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 00:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-27 11:23:55 +02:00
parent da8696ed95 e1beaaa0f7
commit 7177f19436
289 changed files with 2434 additions and 2421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@ -236,7 +236,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
this.lastQueryMeta = null;
this.lastQueryError = null;
let anySeriesFromQuery = _.find(dataList, { refId: this.target.refId });
const anySeriesFromQuery = _.find(dataList, { refId: this.target.refId });
if (anySeriesFromQuery) {
this.lastQueryMeta = anySeriesFromQuery.meta;
}
@ -244,7 +244,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
onDataError(err) {
if (err.data && err.data.results) {
let queryRes = err.data.results[this.target.refId];
const queryRes = err.data.results[this.target.refId];
if (queryRes) {
this.lastQueryMeta = queryRes.meta;
this.lastQueryError = queryRes.error;