opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 20:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename field to column

Browse Source
This commit is contained in:
Sven Klemm
2018-03-03 20:57:00 +01:00
parent 1a051ce320
commit fd518846b1
3 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
this.removeWhereFilterSegment = uiSegmentSrv.newSegment({
fake: true,
value: '-- remove tag filter --',
value: '-- remove filter --',
});
this.panelCtrl.events.on('data-received', this.onDataReceived.bind(this), $scope);
this.panelCtrl.events.on('data-error', this.onDataError.bind(this), $scope);
@ -390,9 +390,6 @@ export class PostgresQueryCtrl extends QueryCtrl {
.metricFindQuery(this.queryBuilder.buildColumnQuery())
.then(tags => {
var options = [];
if (!this.queryModel.hasFill()) {
options.push(this.uiSegmentSrv.newSegment({ value: 'fill(null)' }));
}
if (!this.target.limit) {
options.push(this.uiSegmentSrv.newSegment({ value: 'LIMIT' }));
}
@ -400,7 +397,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
options.push(this.uiSegmentSrv.newSegment({ value: 'time($interval)' }));
}
for (let tag of tags) {
options.push(this.uiSegmentSrv.newSegment({ value: 'tag(' + tag.text + ')' }));
options.push(this.uiSegmentSrv.newSegment({ value: tag.text }));
}
return options;
})