From 913f17ee8a92d1365e9edaa64fdb45ec4ed0f10e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Fri, 7 Oct 2016 16:04:51 +0200
Subject: [PATCH] fix(plugin dashboards): fixed issue with plugin dashboard
list, fixes #6215
---
public/app/features/plugins/import_list/import_list.html | 6 ++++--
public/app/plugins/datasource/elasticsearch/query_def.js | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/public/app/features/plugins/import_list/import_list.html b/public/app/features/plugins/import_list/import_list.html
index 715f5b3be74..b8e6e13cf8c 100644
--- a/public/app/features/plugins/import_list/import_list.html
+++ b/public/app/features/plugins/import_list/import_list.html
@@ -14,8 +14,9 @@
</span>
</td>
<td>
- <span ng-if="dash.imported" bs-tooltip='"Imported revision:" + dash.importedRevision'>
+ <span>
Revision: {{dash.revision}}
+ <span ng-if="dash.imported" class="small">(Imported: {{dash.importedRevision}})</span>
<span>
</td>
<td style="text-align: right">
@@ -23,7 +24,8 @@
Import
</button>
<button class="btn btn-secondary btn-small" ng-click="ctrl.import(dash, true)" ng-show="dash.imported">
- Update
+ <span ng-if="dash.revision !== dash.importedRevision">Update</span>
+ <span ng-if="dash.revision === dash.importedRevision">Re-import</span>
</button>
<button class="btn btn-danger btn-small" ng-click="ctrl.remove(dash)" ng-show="dash.imported">
<i class="fa fa-trash"></i>
diff --git a/public/app/plugins/datasource/elasticsearch/query_def.js b/public/app/plugins/datasource/elasticsearch/query_def.js
index 9a45b138b21..187e5c2f4fa 100644
--- a/public/app/plugins/datasource/elasticsearch/query_def.js
+++ b/public/app/plugins/datasource/elasticsearch/query_def.js
@@ -22,7 +22,7 @@ function (_) {
bucketAggTypes: [
{text: "Terms", value: 'terms', requiresField: true},
{text: "Filters", value: 'filters' },
- {text: "Geo Hash Grid", value: 'geohash_grid', requiresField: true},
+ {text: "Geo Hash Grid", value: 'geohash_grid', requiresField: true},
{text: "Date Histogram", value: 'date_histogram', requiresField: true},
],