IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugin dashboards): fixed issue with plugin dashboard list, fixes #6215

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-10-07 16:04:51 +02:00
parent a3c91450d5
commit 913f17ee8a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/plugins/import_list/import_list.html
View File

@ -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>

2
public/app/plugins/datasource/elasticsearch/query_def.js
View File

@ -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},
],