Skip to content

Commit 913f17e

Browse files
committed
fix(plugin dashboards): fixed issue with plugin dashboard list, fixes grafana#6215
1 parent a3c9145 commit 913f17e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

public/app/features/plugins/import_list/import_list.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@
1414
</span>
1515
</td>
1616
<td>
17-
<span ng-if="dash.imported" bs-tooltip='"Imported revision:" + dash.importedRevision'>
17+
<span>
1818
Revision: {{dash.revision}}
19+
<span ng-if="dash.imported" class="small">(Imported: {{dash.importedRevision}})</span>
1920
<span>
2021
</td>
2122
<td style="text-align: right">
2223
<button class="btn btn-secondary btn-small" ng-click="ctrl.import(dash, false)" ng-show="!dash.imported">
2324
Import
2425
</button>
2526
<button class="btn btn-secondary btn-small" ng-click="ctrl.import(dash, true)" ng-show="dash.imported">
26-
Update
27+
<span ng-if="dash.revision !== dash.importedRevision">Update</span>
28+
<span ng-if="dash.revision === dash.importedRevision">Re-import</span>
2729
</button>
2830
<button class="btn btn-danger btn-small" ng-click="ctrl.remove(dash)" ng-show="dash.imported">
2931
<i class="fa fa-trash"></i>

public/app/plugins/datasource/elasticsearch/query_def.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function (_) {
2222
bucketAggTypes: [
2323
{text: "Terms", value: 'terms', requiresField: true},
2424
{text: "Filters", value: 'filters' },
25-
{text: "Geo Hash Grid", value: 'geohash_grid', requiresField: true},
25+
{text: "Geo Hash Grid", value: 'geohash_grid', requiresField: true},
2626
{text: "Date Histogram", value: 'date_histogram', requiresField: true},
2727
],
2828

0 commit comments

Comments
 (0)