Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
913f17ee
Commit
913f17ee
authored
Oct 07, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(plugin dashboards): fixed issue with plugin dashboard list, fixes #6215
parent
a3c91450
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
public/app/features/plugins/import_list/import_list.html
+4
-2
public/app/plugins/datasource/elasticsearch/query_def.js
+1
-1
No files found.
public/app/features/plugins/import_list/import_list.html
View file @
913f17ee
...
...
@@ -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>
...
...
public/app/plugins/datasource/elasticsearch/query_def.js
View file @
913f17ee
...
...
@@ -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
},
],
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment