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
0762c38d
Commit
0762c38d
authored
Apr 26, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ds_edit): dont show warning when data source does not support testing, fixes #4811
parent
6bc898b2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
public/app/features/plugins/ds_edit_ctrl.ts
+3
-3
public/app/features/plugins/partials/ds_edit.html
+1
-1
No files found.
public/app/features/plugins/ds_edit_ctrl.ts
View file @
0762c38d
...
@@ -98,9 +98,7 @@ export class DataSourceEditCtrl {
...
@@ -98,9 +98,7 @@ export class DataSourceEditCtrl {
this
.
datasourceSrv
.
get
(
this
.
current
.
name
).
then
(
datasource
=>
{
this
.
datasourceSrv
.
get
(
this
.
current
.
name
).
then
(
datasource
=>
{
if
(
!
datasource
.
testDatasource
)
{
if
(
!
datasource
.
testDatasource
)
{
this
.
testing
.
message
=
'Data source does not support test connection feature.'
;
delete
this
.
testing
;
this
.
testing
.
status
=
'warning'
;
this
.
testing
.
title
=
'Unknown'
;
return
;
return
;
}
}
...
@@ -118,7 +116,9 @@ export class DataSourceEditCtrl {
...
@@ -118,7 +116,9 @@ export class DataSourceEditCtrl {
}
}
});
});
}).
finally
(()
=>
{
}).
finally
(()
=>
{
if
(
this
.
testing
)
{
this
.
testing
.
done
=
true
;
this
.
testing
.
done
=
true
;
}
});
});
}
}
...
...
public/app/features/plugins/partials/ds_edit.html
View file @
0762c38d
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
</plugin-component>
</plugin-component>
</rebuild-on-change>
</rebuild-on-change>
<div
ng-if=
"ctrl.testing"
style=
"margin-top: 25px
"
>
<div
ng-if=
"ctrl.testing"
class=
"gf-form-group
"
>
<h5
ng-show=
"!ctrl.testing.done"
>
Testing....
<i
class=
"fa fa-spiner fa-spin"
></i></h5>
<h5
ng-show=
"!ctrl.testing.done"
>
Testing....
<i
class=
"fa fa-spiner fa-spin"
></i></h5>
<div
class=
"alert-{{ctrl.testing.status}} alert"
>
<div
class=
"alert-{{ctrl.testing.status}} alert"
>
<div
class=
"alert-title"
>
{{ctrl.testing.title}}
</div>
<div
class=
"alert-title"
>
{{ctrl.testing.title}}
</div>
...
...
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