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
4ea9f302
Commit
4ea9f302
authored
Jan 18, 2018
by
Johannes Schill
Committed by
Daniel Lee
Jan 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashfolders: Remove variables not used and pass in the real dashboardId #10275
parent
02a3951f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
public/app/containers/ManageDashboards/FolderPermissions.tsx
+4
-5
public/app/core/components/Permissions/Permissions.tsx
+0
-1
No files found.
public/app/containers/ManageDashboards/FolderPermissions.tsx
View file @
4ea9f302
...
...
@@ -8,8 +8,6 @@ import Permissions from 'app/core/components/Permissions/Permissions';
@
inject
(
'nav'
,
'folder'
,
'view'
,
'permissions'
)
@
observer
export
class
FolderPermissions
extends
Component
<
IContainerProps
,
any
>
{
dashboard
:
any
;
constructor
(
props
)
{
super
(
props
);
this
.
loadStore
();
...
...
@@ -18,7 +16,6 @@ export class FolderPermissions extends Component<IContainerProps, any> {
loadStore
()
{
const
{
nav
,
folder
,
view
}
=
this
.
props
;
return
folder
.
load
(
view
.
routeParams
.
get
(
'slug'
)
as
string
).
then
(
res
=>
{
this
.
dashboard
=
res
.
dashboard
;
return
nav
.
initFolderNav
(
toJS
(
folder
.
folder
),
'manage-folder-permissions'
);
});
}
...
...
@@ -30,15 +27,17 @@ export class FolderPermissions extends Component<IContainerProps, any> {
return
<
h2
>
Loading
</
h2
>;
}
const
dashboardId
=
folder
.
folder
.
id
;
return
(
<
div
>
<
PageHeader
model=
{
nav
as
any
}
/>
<
div
className=
"page-container page-body"
>
<
h2
className=
"page-sub-heading"
>
Folder Permissions
</
h2
>
<
Permissions
permissions=
{
permissions
}
isFolder=
{
true
}
error=
""
dashboardId=
{
1
}
dashboardId=
{
dashboardId
}
backendSrv=
{
this
.
props
.
backendSrv
}
/>
</
div
>
...
...
public/app/core/components/Permissions/Permissions.tsx
View file @
4ea9f302
...
...
@@ -23,7 +23,6 @@ export interface DashboardAcl {
}
export
interface
IProps
{
error
:
string
;
dashboardId
:
number
;
permissions
?:
any
;
isFolder
:
boolean
;
...
...
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