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
38c94bb6
Unverified
Commit
38c94bb6
authored
Jun 04, 2018
by
Marcus Efraimsson
Committed by
GitHub
Jun 04, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12117 from grafana/11525-dashlist-folder-picker
Fix search by folder in dashboard list panel
parents
9e59751c
d650dc94
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
public/app/plugins/panel/dashlist/editor.html
+4
-3
public/app/plugins/panel/dashlist/module.ts
+3
-2
No files found.
public/app/plugins/panel/dashlist/editor.html
View file @
38c94bb6
...
...
@@ -23,10 +23,11 @@
</div>
<div
class=
"gf-form"
>
<folder-picker
root-name=
"All"
initial-folder-id=
"ctrl.panel.folderId"
<folder-picker
initial-folder-id=
"ctrl.panel.folderId"
on-change=
"ctrl.onFolderChange($folder)"
label-class=
"width-6"
>
label-class=
"width-6"
initial-title=
"'All'"
enable-reset=
"true"
>
</folder-picker>
</div>
...
...
public/app/plugins/panel/dashlist/module.ts
View file @
38c94bb6
...
...
@@ -17,7 +17,7 @@ class DashListCtrl extends PanelCtrl {
search
:
false
,
starred
:
true
,
headings
:
true
,
folderId
:
0
,
folderId
:
null
,
};
/** @ngInject */
...
...
@@ -85,7 +85,8 @@ class DashListCtrl extends PanelCtrl {
limit
:
this
.
panel
.
limit
,
query
:
this
.
panel
.
query
,
tag
:
this
.
panel
.
tags
,
folderId
:
this
.
panel
.
folderId
,
folderIds
:
this
.
panel
.
folderId
,
type
:
'dash-db'
,
};
return
this
.
backendSrv
.
search
(
params
).
then
(
result
=>
{
...
...
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