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
315ecf85
Unverified
Commit
315ecf85
authored
Jan 12, 2018
by
Dan Cech
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tests & some display issues
parent
e9d33750
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
8 deletions
+2
-8
public/app/plugins/datasource/graphite/func_editor.js
+1
-1
public/app/plugins/datasource/graphite/partials/query.editor.html
+0
-6
public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
+1
-1
No files found.
public/app/plugins/datasource/graphite/func_editor.js
View file @
315ecf85
...
...
@@ -94,9 +94,9 @@ function (angular, _, $, rst2html) {
// remove optional empty params
if
(
newValue
!==
''
||
paramDef
(
paramIndex
).
optional
)
{
func
.
updateParam
(
newValue
,
paramIndex
);
$link
.
html
(
newValue
?
templateSrv
.
highlightVariablesAsHtml
(
newValue
)
:
' '
);
}
$link
.
html
(
templateSrv
.
highlightVariablesAsHtml
(
newValue
));
scheduledRelinkIfNeeded
();
$scope
.
$apply
(
function
()
{
...
...
public/app/plugins/datasource/graphite/partials/query.editor.html
View file @
315ecf85
...
...
@@ -40,7 +40,6 @@
placeholder=
"Tag value"
get-options=
"ctrl.getTagValues(tag, $index, $query)"
on-change=
"ctrl.tagChanged(tag, $index)"
start-open=
"!ctrl.showDelimiter($index)"
/>
<label
class=
"gf-form-label query-keyword"
ng-if=
"ctrl.showDelimiter($index)"
>
AND
</label>
</div>
...
...
@@ -56,11 +55,6 @@
<div
ng-if=
"ctrl.paused"
class=
"gf-form"
>
<a
ng-click=
"ctrl.unpause()"
class=
"gf-form-label query-part"
><i
class=
"fa fa-play"
></i></a>
</div>
<!--
<div ng-if="!ctrl.paused" class="gf-form">
<a ng-click="ctrl.pause()" class="gf-form-label query-part"><i class="fa fa-pause"></i></a>
</div>
-->
<div
class=
"gf-form gf-form--grow"
>
<div
class=
"gf-form-label gf-form-label--grow"
></div>
...
...
public/app/plugins/datasource/graphite/specs/query_ctrl_specs.ts
View file @
315ecf85
...
...
@@ -26,7 +26,7 @@ describe('GraphiteQueryCtrl', function() {
ctx
.
datasource
.
metricFindQuery
=
sinon
.
stub
().
returns
(
ctx
.
$q
.
when
([]));
ctx
.
datasource
.
getFuncDefs
=
sinon
.
stub
().
returns
(
ctx
.
$q
.
when
(
gfunc
.
getFuncDefs
(
'1.0'
)));
ctx
.
datasource
.
getFuncDef
=
gfunc
.
getFuncDef
;
ctx
.
datasource
.
waitForFuncDefsLoaded
=
ctx
.
$q
.
when
(
null
);
ctx
.
datasource
.
waitForFuncDefsLoaded
=
sinon
.
stub
().
returns
(
ctx
.
$q
.
when
(
null
)
);
ctx
.
datasource
.
createFuncInstance
=
gfunc
.
createFuncInstance
;
ctx
.
panelCtrl
=
{
panel
:
{}
};
ctx
.
panelCtrl
=
{
...
...
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