IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

dashfolders: Remove variables not used and pass in the real dashboardId #10275

Browse Source
This commit is contained in:
Johannes Schill 2018-01-18 20:46:01 +01:00 committed by Daniel Lee
parent 02a3951f95
commit 4ea9f3027a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/containers/ManageDashboards/FolderPermissions.tsx
View File

@ -8,8 +8,6 @@ import Permissions from 'app/core/components/Permissions/Permissions';
@inject('nav', 'folder', 'view', 'permissions') @inject('nav', 'folder', 'view', 'permissions')
@observer @observer
export class FolderPermissions extends Component<IContainerProps, any> { export class FolderPermissions extends Component<IContainerProps, any> {
dashboard: any;
constructor(props) { constructor(props) {
super(props); super(props);
this.loadStore(); this.loadStore();
@ -18,7 +16,6 @@ export class FolderPermissions extends Component<IContainerProps, any> {
loadStore() { loadStore() {
const { nav, folder, view } = this.props; const { nav, folder, view } = this.props;
return folder.load(view.routeParams.get('slug') as string).then(res => { return folder.load(view.routeParams.get('slug') as string).then(res => {
this.dashboard = res.dashboard;
return nav.initFolderNav(toJS(folder.folder), 'manage-folder-permissions'); return nav.initFolderNav(toJS(folder.folder), 'manage-folder-permissions');
}); });
} }
@ -30,15 +27,17 @@ export class FolderPermissions extends Component<IContainerProps, any> {
return <h2>Loading</h2>; return <h2>Loading</h2>;
} }
const dashboardId = folder.folder.id;
return ( return (
<div> <div>
<PageHeader model={nav as any} /> <PageHeader model={nav as any} />
<div className="page-container page-body"> <div className="page-container page-body">
<h2 className="page-sub-heading">Folder Permissions</h2>
<Permissions <Permissions
permissions={permissions} permissions={permissions}
isFolder={true} isFolder={true}
error="" dashboardId={dashboardId}
dashboardId={1}
backendSrv={this.props.backendSrv} backendSrv={this.props.backendSrv}
/> />
</div> </div>

1
public/app/core/components/Permissions/Permissions.tsx
View File

@ -23,7 +23,6 @@ export interface DashboardAcl {
} }
export interface IProps { export interface IProps {
error: string;
dashboardId: number; dashboardId: number;
permissions?: any; permissions?: any;
isFolder: boolean; isFolder: boolean;