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
39cdf857
Commit
39cdf857
authored
Aug 21, 2014
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small refactoring for search result and dashboard id/title handling
parent
1bc85266
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
3 deletions
+6
-3
src/app/partials/search.html
+2
-2
src/app/services/dashboard/dashboardSrv.js
+2
-1
src/app/services/elasticsearch/es-datasource.js
+1
-0
src/app/services/influxdb/influxdbDatasource.js
+1
-0
No files found.
src/app/partials/search.html
View file @
39cdf857
...
...
@@ -45,7 +45,7 @@
</span>
</div>
<h6
ng-hide=
"results.dashboards.length
|| results.metrics.length"
>
No dashboards or metrics matching your query found
</h6>
<h6
ng-hide=
"results.dashboards.length
"
>
No dashboards matching your query were found.
</h6>
<div
class=
"search-results-container"
ng-if=
"tagsOnly"
>
<div
ng-repeat=
"tag in results.tags"
...
...
@@ -81,7 +81,7 @@
<a
class=
"search-result-link"
>
<i
class=
"icon icon-th-large"
></i>
<span
bo-text=
"row.
id
"
></span>
<span
bo-text=
"row.
title
"
></span>
</a>
</div>
...
...
src/app/services/dashboard/dashboardSrv.js
View file @
39cdf857
...
...
@@ -19,7 +19,9 @@ function (angular, $, kbn, _, moment) {
data
=
{};
}
this
.
id
=
data
.
id
||
null
;
this
.
title
=
data
.
title
||
'No Title'
;
this
.
originalTitle
=
this
.
title
;
this
.
tags
=
data
.
tags
||
[];
this
.
style
=
data
.
style
||
"dark"
;
this
.
timezone
=
data
.
timezone
||
'browser'
;
...
...
@@ -31,7 +33,6 @@ function (angular, $, kbn, _, moment) {
this
.
templating
=
data
.
templating
||
{
list
:
[]
};
this
.
refresh
=
data
.
refresh
;
this
.
version
=
data
.
version
||
0
;
this
.
$state
=
data
.
$state
;
if
(
this
.
nav
.
length
===
0
)
{
this
.
nav
.
push
({
type
:
'timepicker'
});
...
...
src/app/services/elasticsearch/es-datasource.js
View file @
39cdf857
...
...
@@ -216,6 +216,7 @@ function (angular, _, $, config, kbn, moment) {
for
(
var
i
=
0
;
i
<
results
.
hits
.
hits
.
length
;
i
++
)
{
hits
.
dashboards
.
push
({
id
:
results
.
hits
.
hits
[
i
].
_id
,
title
:
results
.
hits
.
hits
[
i
].
_id
,
tags
:
results
.
hits
.
hits
[
i
].
_source
.
tags
});
}
...
...
src/app/services/influxdb/influxdbDatasource.js
View file @
39cdf857
...
...
@@ -358,6 +358,7 @@ function (angular, _, kbn, InfluxSeries) {
for
(
var
i
=
0
;
i
<
results
.
length
;
i
++
)
{
var
hit
=
{
id
:
results
[
i
].
points
[
0
][
dashCol
],
title
:
results
[
i
].
points
[
0
][
dashCol
],
tags
:
results
[
i
].
points
[
0
][
tagsCol
].
split
(
","
)
};
hit
.
tags
=
hit
.
tags
[
0
]
?
hit
.
tags
:
[];
...
...
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