minor tweaks
This commit is contained in:
Torkel Ödegaard
+1
-1
@@ -92,7 +92,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
|
|||||||
Text: "Create",
|
Text: "Create",
|
||||||
Id: "create",
|
Id: "create",
|
||||||
Icon: "fa fa-fw fa-plus",
|
Icon: "fa fa-fw fa-plus",
|
||||||
Url: "#",
|
Url: setting.AppSubUrl + "dashboard/new",
|
||||||
Children: []*dtos.NavLink{
|
Children: []*dtos.NavLink{
|
||||||
{Text: "Dashboard", Icon: "gicon gicon-dashboard-new", Url: setting.AppSubUrl + "/dashboard/new"},
|
{Text: "Dashboard", Icon: "gicon gicon-dashboard-new", Url: setting.AppSubUrl + "/dashboard/new"},
|
||||||
{Text: "Folder", SubTitle: "Create a new folder to organize your dashboards", Id: "folder", Icon: "gicon gicon-folder-new", Url: setting.AppSubUrl + "/dashboards/folder/new"},
|
{Text: "Folder", SubTitle: "Create a new folder to organize your dashboards", Id: "folder", Icon: "gicon gicon-folder-new", Url: setting.AppSubUrl + "/dashboards/folder/new"},
|
||||||
|
|||||||
@@ -238,63 +238,12 @@ export class BackendSrv {
|
|||||||
schemaVersion: 16,
|
schemaVersion: 16,
|
||||||
title: name,
|
title: name,
|
||||||
editable: true,
|
editable: true,
|
||||||
hideControls: true,
|
panels: []
|
||||||
panels: [
|
|
||||||
{
|
|
||||||
id: 1,
|
|
||||||
folderId: 0,
|
|
||||||
headings: false,
|
|
||||||
limit: 1000,
|
|
||||||
links: [],
|
|
||||||
query: '',
|
|
||||||
recent: false,
|
|
||||||
search: true,
|
|
||||||
starred: false,
|
|
||||||
tags: [],
|
|
||||||
title: 'Dashboards in this folder',
|
|
||||||
type: 'dashlist',
|
|
||||||
gridPos: {
|
|
||||||
x: 0,
|
|
||||||
y: 0,
|
|
||||||
w: 8,
|
|
||||||
h: 10
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 2,
|
|
||||||
onlyAlertsOnDashboard: true,
|
|
||||||
title: 'Alerts in this folder',
|
|
||||||
type: 'alertlist',
|
|
||||||
gridPos: {
|
|
||||||
x: 4,
|
|
||||||
y: 0,
|
|
||||||
w: 8,
|
|
||||||
h: 10
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
id: 3,
|
|
||||||
title: 'Permissions for this folder',
|
|
||||||
type: 'permissionlist',
|
|
||||||
folderId: 0,
|
|
||||||
gridPos: {
|
|
||||||
x: 8,
|
|
||||||
y: 0,
|
|
||||||
w: 8,
|
|
||||||
h: 10
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return this.post('/api/dashboards/db/', {dashboard: dash, isFolder: true, overwrite: false})
|
return this.post('/api/dashboards/db/', {dashboard: dash, isFolder: true, overwrite: false})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
return this.getDashboard('db', res.slug);
|
return this.getDashboard('db', res.slug);
|
||||||
})
|
|
||||||
.then(res => {
|
|
||||||
res.dashboard.panels[0].folderId = res.dashboard.id;
|
|
||||||
res.dashboard.panels[2].folderId = res.dashboard.id;
|
|
||||||
return this.saveDashboard(res.dashboard, {overwrite: false});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
<page-header model="ctrl.navModel"></page-header>
|
<page-header model="ctrl.navModel"></page-header>
|
||||||
|
|
||||||
<div class="page-container page-body">
|
<div class="page-container page-body">
|
||||||
<h1>Coming soon! Permissions will be added in Grafana 5.0 beta.</h1>
|
<h2 class="page-sub-heading">
|
||||||
</div>
|
Coming soon! Permissions will be added in Grafana 5.0 beta.
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -1,24 +1,24 @@
|
|||||||
<page-header model="ctrl.navModel"></page-header>
|
<page-header model="ctrl.navModel"></page-header>
|
||||||
|
|
||||||
<div class="page-container page-body">
|
<div class="page-container page-body">
|
||||||
|
<h2 class="page-sub-heading">Folder Settings</h2>
|
||||||
|
|
||||||
<div class="section gf-form-group">
|
<div class="section gf-form-group">
|
||||||
<h1 class="section-heading">Folder Settings</h1>
|
<form name="folderSettingsForm" ng-submit="ctrl.save()">
|
||||||
<form name="folderSettingsForm" ng-submit="ctrl.save()">
|
<div class="gf-form">
|
||||||
<div class="gf-form">
|
<label class="gf-form-label width-7">Name</label>
|
||||||
<label class="gf-form-label width-7">Name</label>
|
<input type="text" class="gf-form-input width-30" ng-model='ctrl.dashboard.title'></input>
|
||||||
<input type="text" class="gf-form-input width-30" ng-model='ctrl.dashboard.title'></input>
|
</div>
|
||||||
</div>
|
<div class="gf-form-button-row">
|
||||||
<div class="gf-form-button-row">
|
<button type="submit" class="btn btn-success" ng-disabled="!ctrl.canSave">
|
||||||
<button type="submit" class="btn btn-success" ng-disabled="!ctrl.canSave">
|
<i class="fa fa-trash"></i>
|
||||||
<i class="fa fa-trash"></i>
|
Save
|
||||||
Save
|
</button>
|
||||||
</button>
|
<button class="btn btn-danger" ng-click="ctrl.delete($event)" ng-disabled="!ctrl.canSave">
|
||||||
<button class="btn btn-danger" ng-click="ctrl.delete($event)" ng-disabled="!ctrl.canSave">
|
<i class="fa fa-trash"></i>
|
||||||
<i class="fa fa-trash"></i>
|
Delete
|
||||||
Delete
|
</button>
|
||||||
</button>
|
</div>
|
||||||
</div>
|
</form>
|
||||||
</form>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
<div>
|
|
||||||
<div class="section gf-form-group">
|
|
||||||
<h5 class="section-heading">Options</h5>
|
|
||||||
<div class="gf-form">
|
|
||||||
<folder-picker initial-folder-id="ctrl.panel.folderId"
|
|
||||||
on-change="ctrl.onFolderChange($folder)"
|
|
||||||
label-class="width-6">
|
|
||||||
</folder-picker>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
|
||||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
||||||
width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<path fill="#1F1F1F" d="M18.2,4.2c-1.5,0-2.9,0.6-3.9,1.6l-0.5,0.5l-0.5-0.5c-1-1.1-2.4-1.6-3.9-1.6S6.6,4.8,5.5,5.8
|
|
||||||
c-1,1-1.6,2.4-1.6,3.9s0.6,2.9,1.6,3.9l8.3,8.3l8.3-8.3c1-1,1.6-2.4,1.6-3.9s-0.6-2.9-1.6-3.9C21.1,4.8,19.7,4.2,18.2,4.2z
|
|
||||||
M21,12.5l-7.2,7.2l-7.1-7.1c-0.7-0.7-1.1-1.7-1.1-2.8c0-1,0.4-2,1.1-2.8c0.7-0.7,1.7-1.1,2.8-1.1c1,0,2,0.4,2.8,1.1l0.5,0.5
|
|
||||||
l0.6,0.6l0.6,0.6l0.6-0.6L15,7.5L15.5,7c0.7-0.7,1.7-1.1,2.8-1.1c1,0,2,0.4,2.8,1.1c0.7,0.7,1.1,1.7,1.1,2.8
|
|
||||||
C22.1,10.8,21.7,11.8,21,12.5z"/>
|
|
||||||
<path fill="#1F1F1F" d="M18.2,77.3c-1.5,0-2.9,0.6-3.9,1.6l-0.5,0.5L13.4,79c-1-1.1-2.4-1.6-3.9-1.6S6.6,77.9,5.5,79
|
|
||||||
c-1,1-1.6,2.4-1.6,3.9s0.6,2.9,1.6,3.9l8.3,8.3l8.3-8.3c1-1,1.6-2.4,1.6-3.9S23.2,80,22.1,79C21.1,77.9,19.7,77.3,18.2,77.3z
|
|
||||||
M21,85.6l-7.2,7.2l-7.1-7.1c-0.7-0.7-1.1-1.7-1.1-2.8c0-1,0.4-2,1.1-2.8C7.4,79.4,8.4,79,9.4,79c1,0,2,0.4,2.8,1.1l0.5,0.5
|
|
||||||
l0.6,0.6l0.6,0.6l0.6-0.6l0.6-0.6l0.5-0.5c0.7-0.7,1.7-1.1,2.8-1.1c1,0,2,0.4,2.8,1.1c0.7,0.7,1.1,1.7,1.1,2.8
|
|
||||||
C22.1,83.9,21.7,84.9,21,85.6z"/>
|
|
||||||
<path fill="#1F1F1F" d="M0,0v100h100V0H0z M22.7,87.4l-8.9,8.9l-8.9-8.9C3.7,86.2,3,84.6,3,82.9s0.7-3.3,1.9-4.5
|
|
||||||
c1.2-1.2,2.8-1.9,4.5-1.9c1.6,0,3.2,0.6,4.4,1.7c1.2-1.1,2.7-1.7,4.4-1.7c1.7,0,3.3,0.7,4.5,1.9c1.2,1.2,1.9,2.8,1.9,4.5
|
|
||||||
S23.9,86.2,22.7,87.4z M22.7,63l-8.9,8.9L4.9,63C3.7,61.8,3,60.2,3,58.5c0-1.7,0.7-3.3,1.9-4.5c1.2-1.2,2.8-1.9,4.5-1.9
|
|
||||||
c1.1,0,2.1,0.3,3,0.7l0,0.1l0,0l-1.3,6.6l0,0l0,0.1l2.3-0.1l-0.6,6.1l0-0.1l0,0l3.4-8.3l-2,0.3l1.2-3.7l0-0.1l0,0l0.3-1.1
|
|
||||||
c0.8-0.3,1.6-0.5,2.4-0.5c1.7,0,3.3,0.7,4.5,1.9c1.2,1.2,1.9,2.8,1.9,4.5C24.6,60.2,23.9,61.8,22.7,63z M22.7,38.7l-8.9,8.9
|
|
||||||
l-8.9-8.9C3.7,37.5,3,35.9,3,34.1s0.7-3.3,1.9-4.5c1.2-1.2,2.8-1.9,4.5-1.9c1.1,0,2.1,0.3,3,0.7l0,0.1l0,0l-1.3,6.6l0,0l0,0.1
|
|
||||||
l2.3-0.1l-0.6,6.1l0-0.1l0,0l3.4-8.3l-2,0.3l1.2-3.7l0-0.1l0,0l0.3-1.1c0.8-0.3,1.6-0.5,2.4-0.5c1.7,0,3.3,0.7,4.5,1.9
|
|
||||||
c1.2,1.2,1.9,2.8,1.9,4.5S23.9,37.5,22.7,38.7z M22.7,14.3l-8.9,8.9l-8.9-8.9C3.7,13.1,3,11.5,3,9.8s0.7-3.3,1.9-4.5
|
|
||||||
c1.2-1.2,2.8-1.9,4.5-1.9c1.6,0,3.2,0.6,4.4,1.7C15,4,16.6,3.4,18.2,3.4c1.7,0,3.3,0.7,4.5,1.9c1.2,1.2,1.9,2.8,1.9,4.5
|
|
||||||
S23.9,13.1,22.7,14.3z M96.6,94.4c0,1-0.8,1.8-1.8,1.8H33.4c-1,0-1.8-0.8-1.8-1.8V78.6c0-1,0.8-1.8,1.8-1.8h61.4
|
|
||||||
c1,0,1.8,0.8,1.8,1.8V94.4z M96.6,69.9c0,1-0.8,1.8-1.8,1.8H33.4c-1,0-1.8-0.8-1.8-1.8V54.1c0-1,0.8-1.8,1.8-1.8h61.4
|
|
||||||
c1,0,1.8,0.8,1.8,1.8V69.9z M96.6,45.4c0,1-0.8,1.8-1.8,1.8H33.4c-1,0-1.8-0.8-1.8-1.8V29.6c0-1,0.8-1.8,1.8-1.8h61.4
|
|
||||||
c1,0,1.8,0.8,1.8,1.8V45.4z M96.6,20.9c0,1-0.8,1.8-1.8,1.8H33.4c-1,0-1.8-0.8-1.8-1.8V5.1c0-1,0.8-1.8,1.8-1.8h61.4
|
|
||||||
c1,0,1.8,0.8,1.8,1.8V20.9z"/>
|
|
||||||
<path fill="#1F1F1F" d="M18.2,53c-0.5,0-1,0.1-1.4,0.2l-0.7,2.1c0.6-0.4,1.3-0.6,2.1-0.6c1,0,2,0.4,2.8,1.1
|
|
||||||
c0.7,0.7,1.1,1.7,1.1,2.8c0,1-0.4,2-1.1,2.8l-7.2,7.2l-7.1-7.1c-0.7-0.7-1.1-1.7-1.1-2.8c0-1,0.4-2,1.1-2.8
|
|
||||||
c0.7-0.7,1.7-1.1,2.8-1.1c0.5,0,1,0.1,1.5,0.3l0.3-1.6c-0.6-0.2-1.2-0.3-1.8-0.3c-1.5,0-2.9,0.6-3.9,1.6c-1,1-1.6,2.4-1.6,3.9
|
|
||||||
c0,1.5,0.6,2.9,1.6,3.9l8.3,8.3l8.3-8.3c1-1,1.6-2.4,1.6-3.9c0-1.5-0.6-2.9-1.6-3.9C21.1,53.5,19.7,53,18.2,53z"/>
|
|
||||||
<path fill="#1F1F1F" d="M18.2,28.6c-0.5,0-1,0.1-1.4,0.2l-0.7,2.1c0.6-0.4,1.3-0.6,2.1-0.6c1,0,2,0.4,2.8,1.1
|
|
||||||
c0.7,0.7,1.1,1.7,1.1,2.8c0,1-0.4,2-1.1,2.8l-7.2,7.2l-7.1-7.1c-0.7-0.7-1.1-1.7-1.1-2.8c0-1,0.4-2,1.1-2.8
|
|
||||||
c0.7-0.7,1.7-1.1,2.8-1.1c0.5,0,1,0.1,1.5,0.3l0.3-1.6c-0.6-0.2-1.2-0.3-1.8-0.3c-1.5,0-2.9,0.6-3.9,1.6c-1,1-1.6,2.4-1.6,3.9
|
|
||||||
s0.6,2.9,1.6,3.9l8.3,8.3l8.3-8.3c1-1,1.6-2.4,1.6-3.9s-0.6-2.9-1.6-3.9C21.1,29.2,19.7,28.6,18.2,28.6z"/>
|
|
||||||
<path fill="#898989" d="M94.7,3.3H33.4c-1,0-1.8,0.8-1.8,1.8v15.8c0,1,0.8,1.8,1.8,1.8h61.4c1,0,1.8-0.8,1.8-1.8V5.1
|
|
||||||
C96.6,4.1,95.7,3.3,94.7,3.3z"/>
|
|
||||||
<path fill="#898989" d="M94.7,27.8H33.4c-1,0-1.8,0.8-1.8,1.8v15.8c0,1,0.8,1.8,1.8,1.8h61.4c1,0,1.8-0.8,1.8-1.8V29.6
|
|
||||||
C96.6,28.6,95.7,27.8,94.7,27.8z"/>
|
|
||||||
<path fill="#898989" d="M94.7,52.3H33.4c-1,0-1.8,0.8-1.8,1.8v15.8c0,1,0.8,1.8,1.8,1.8h61.4c1,0,1.8-0.8,1.8-1.8V54.1
|
|
||||||
C96.6,53.1,95.7,52.3,94.7,52.3z"/>
|
|
||||||
<path fill="#898989" d="M94.7,76.8H33.4c-1,0-1.8,0.8-1.8,1.8v15.8c0,1,0.8,1.8,1.8,1.8h61.4c1,0,1.8-0.8,1.8-1.8V78.6
|
|
||||||
C96.6,77.6,95.7,76.8,94.7,76.8z"/>
|
|
||||||
<path fill="#04A64D" d="M18.2,3.4c-1.6,0-3.2,0.6-4.4,1.7C12.6,4,11.1,3.4,9.4,3.4c-1.7,0-3.3,0.7-4.5,1.9C3.7,6.5,3,8.1,3,9.8
|
|
||||||
s0.7,3.3,1.9,4.5l8.9,8.9l8.9-8.9c1.2-1.2,1.9-2.8,1.9-4.5s-0.7-3.3-1.9-4.5C21.5,4.1,19.9,3.4,18.2,3.4z M22.1,13.7L13.8,22
|
|
||||||
l-8.3-8.3c-1-1-1.6-2.4-1.6-3.9s0.6-2.9,1.6-3.9c1-1,2.4-1.6,3.9-1.6s2.9,0.6,3.9,1.6l0.5,0.5l0.5-0.5c1-1,2.4-1.6,3.9-1.6
|
|
||||||
c1.5,0,2.9,0.6,3.9,1.6c1,1,1.6,2.4,1.6,3.9S23.2,12.7,22.1,13.7z"/>
|
|
||||||
<path fill="#04A64D" d="M18.2,5.9c-1,0-2,0.4-2.8,1.1L15,7.5l-0.6,0.6l-0.6,0.6l-0.6-0.6l-0.6-0.6L12.2,7c-0.7-0.7-1.7-1.1-2.8-1.1
|
|
||||||
c-1,0-2,0.4-2.8,1.1C5.9,7.8,5.5,8.7,5.5,9.8c0,1,0.4,2,1.1,2.8l7.1,7.1l7.2-7.2c0.7-0.7,1.1-1.7,1.1-2.8c0-1-0.4-2-1.1-2.8
|
|
||||||
C20.2,6.3,19.3,5.9,18.2,5.9z"/>
|
|
||||||
<path fill="#04A64D" d="M18.2,76.5c-1.6,0-3.2,0.6-4.4,1.7c-1.2-1.1-2.7-1.7-4.4-1.7c-1.7,0-3.3,0.7-4.5,1.9
|
|
||||||
C3.7,79.6,3,81.2,3,82.9s0.7,3.3,1.9,4.5l8.9,8.9l8.9-8.9c1.2-1.2,1.9-2.8,1.9-4.5s-0.7-3.3-1.9-4.5C21.5,77.2,19.9,76.5,18.2,76.5
|
|
||||||
z M22.1,86.8l-8.3,8.3l-8.3-8.3c-1-1-1.6-2.4-1.6-3.9S4.5,80,5.5,79c1-1,2.4-1.6,3.9-1.6s2.9,0.6,3.9,1.6l0.5,0.5l0.5-0.5
|
|
||||||
c1-1,2.4-1.6,3.9-1.6c1.5,0,2.9,0.6,3.9,1.6c1,1,1.6,2.4,1.6,3.9S23.2,85.8,22.1,86.8z"/>
|
|
||||||
<path fill="#04A64D" d="M18.2,79c-1,0-2,0.4-2.8,1.1L15,80.6l-0.6,0.6l-0.6,0.6l-0.6-0.6l-0.6-0.6l-0.5-0.5
|
|
||||||
c-0.7-0.7-1.7-1.1-2.8-1.1c-1,0-2,0.4-2.8,1.1c-0.7,0.7-1.1,1.7-1.1,2.8c0,1,0.4,2,1.1,2.8l7.1,7.1l7.2-7.2
|
|
||||||
c0.7-0.7,1.1-1.7,1.1-2.8c0-1-0.4-2-1.1-2.8C20.2,79.4,19.3,79,18.2,79z"/>
|
|
||||||
<path fill="#EB242A" d="M18.2,27.8c-0.8,0-1.7,0.2-2.4,0.5l-0.3,1.1l0,0l0,0.1l-1.2,3.7l2-0.3l-3.4,8.3l0,0l0,0.1l0.6-6.1l-2.3,0.1
|
|
||||||
l0-0.1l0,0l1.3-6.6l0,0l0-0.1c-0.9-0.5-1.9-0.7-3-0.7c-1.7,0-3.3,0.7-4.5,1.9C3.7,30.8,3,32.4,3,34.1s0.7,3.3,1.9,4.5l8.9,8.9
|
|
||||||
l8.9-8.9c1.2-1.2,1.9-2.8,1.9-4.5s-0.7-3.3-1.9-4.5C21.5,28.4,19.9,27.8,18.2,27.8z M22.1,38.1l-8.3,8.3l-8.3-8.3
|
|
||||||
c-1-1-1.6-2.4-1.6-3.9s0.6-2.9,1.6-3.9c1-1,2.4-1.6,3.9-1.6c0.6,0,1.2,0.1,1.8,0.3l-0.3,1.6c-0.5-0.2-1-0.3-1.5-0.3
|
|
||||||
c-1,0-2,0.4-2.8,1.1c-0.7,0.7-1.1,1.7-1.1,2.8c0,1,0.4,2,1.1,2.8l7.1,7.1l7.2-7.2c0.7-0.7,1.1-1.7,1.1-2.8c0-1-0.4-2-1.1-2.8
|
|
||||||
c-0.7-0.7-1.7-1.1-2.8-1.1c-0.8,0-1.5,0.2-2.1,0.6l0.7-2.1c0.5-0.1,0.9-0.2,1.4-0.2c1.5,0,2.9,0.6,3.9,1.6c1,1,1.6,2.4,1.6,3.9
|
|
||||||
S23.2,37,22.1,38.1z"/>
|
|
||||||
<path fill="#EB242A" d="M18.2,52.1c-0.8,0-1.7,0.2-2.4,0.5l-0.3,1.1l0,0l0,0.1l-1.2,3.7l2-0.3l-3.4,8.3l0,0l0,0.1l0.6-6.1l-2.3,0.1
|
|
||||||
l0-0.1l0,0l1.3-6.6l0,0l0-0.1c-0.9-0.5-1.9-0.7-3-0.7c-1.7,0-3.3,0.7-4.5,1.9C3.7,55.2,3,56.8,3,58.5c0,1.7,0.7,3.3,1.9,4.5
|
|
||||||
l8.9,8.9l8.9-8.9c1.2-1.2,1.9-2.8,1.9-4.5c0-1.7-0.7-3.3-1.9-4.5C21.5,52.8,19.9,52.1,18.2,52.1z M22.1,62.4l-8.3,8.3l-8.3-8.3
|
|
||||||
c-1-1-1.6-2.4-1.6-3.9c0-1.5,0.6-2.9,1.6-3.9c1-1,2.4-1.6,3.9-1.6c0.6,0,1.2,0.1,1.8,0.3l-0.3,1.6c-0.5-0.2-1-0.3-1.5-0.3
|
|
||||||
c-1,0-2,0.4-2.8,1.1c-0.7,0.7-1.1,1.7-1.1,2.8c0,1,0.4,2,1.1,2.8l7.1,7.1l7.2-7.2c0.7-0.7,1.1-1.7,1.1-2.8c0-1-0.4-2-1.1-2.8
|
|
||||||
c-0.7-0.7-1.7-1.1-2.8-1.1c-0.8,0-1.5,0.2-2.1,0.6l0.7-2.1c0.5-0.1,0.9-0.2,1.4-0.2c1.5,0,2.9,0.6,3.9,1.6c1,1,1.6,2.4,1.6,3.9
|
|
||||||
C23.8,60,23.2,61.4,22.1,62.4z"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 7.3 KiB |
@@ -1,30 +0,0 @@
|
|||||||
<section class="card-section card-list-layout-list">
|
|
||||||
<ol class="card-list">
|
|
||||||
<li class="card-item-wrapper" ng-repeat="permission in ctrl.userPermissions">
|
|
||||||
<div class="card-item card-item--alert">
|
|
||||||
<div class="card-item-header">
|
|
||||||
<div class="card-item-sub-name">{{permission.permissionName}}</div>
|
|
||||||
</div>
|
|
||||||
<div class="card-item-body">
|
|
||||||
<div class="card-item-details">
|
|
||||||
<div class="card-item-notice">{{permission.userLogin}}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
<li class="card-item-wrapper" ng-repeat="permission in ctrl.teamPermissions">
|
|
||||||
<div class="card-item card-item--alert">
|
|
||||||
<div class="card-item-header">
|
|
||||||
<div class="card-item-sub-name">{{permission.permissionName}}</div>
|
|
||||||
</div>
|
|
||||||
<div class="card-item-body">
|
|
||||||
<div class="card-item-details">
|
|
||||||
<div class="card-item-notice">{{permission.team}}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ol>
|
|
||||||
</section>
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
///<reference path="../../../headers/common.d.ts" />
|
|
||||||
|
|
||||||
import _ from 'lodash';
|
|
||||||
import {PanelCtrl} from 'app/plugins/sdk';
|
|
||||||
|
|
||||||
class PermissionListCtrl extends PanelCtrl {
|
|
||||||
static templateUrl = 'module.html';
|
|
||||||
|
|
||||||
userPermissions: any[];
|
|
||||||
teamPermissions: any[];
|
|
||||||
roles: any[];
|
|
||||||
|
|
||||||
panelDefaults = {
|
|
||||||
folderId: 0
|
|
||||||
};
|
|
||||||
|
|
||||||
/** @ngInject */
|
|
||||||
constructor($scope, $injector, private backendSrv) {
|
|
||||||
super($scope, $injector);
|
|
||||||
_.defaults(this.panel, this.panelDefaults);
|
|
||||||
|
|
||||||
this.events.on('refresh', this.onRefresh.bind(this));
|
|
||||||
this.events.on('init-edit-mode', this.onInitEditMode.bind(this));
|
|
||||||
|
|
||||||
this.getPermissions();
|
|
||||||
}
|
|
||||||
|
|
||||||
onInitEditMode() {
|
|
||||||
this.editorTabIndex = 1;
|
|
||||||
this.addEditorTab('Options', 'public/app/plugins/panel/permissionlist/editor.html');
|
|
||||||
}
|
|
||||||
|
|
||||||
onRefresh() {
|
|
||||||
var promises = [];
|
|
||||||
|
|
||||||
promises.push(this.getPermissions());
|
|
||||||
|
|
||||||
return Promise.all(promises)
|
|
||||||
.then(this.renderingCompleted.bind(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
onFolderChange(folder: any) {
|
|
||||||
this.panel.folderId = folder.id;
|
|
||||||
this.refresh();
|
|
||||||
}
|
|
||||||
|
|
||||||
getPermissions() {
|
|
||||||
return this.backendSrv.get(`/api/dashboards/id/${this.panel.folderId}/acl`)
|
|
||||||
.then(result => {
|
|
||||||
this.userPermissions = _.filter(result, p => { return p.userId > 0;});
|
|
||||||
this.teamPermissions = _.filter(result, p => { return p.teamId > 0;});
|
|
||||||
// this.roles = this.setRoles(result);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
export {PermissionListCtrl, PermissionListCtrl as PanelCtrl};
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "panel",
|
|
||||||
"name": "Permission List",
|
|
||||||
"id": "permissionlist",
|
|
||||||
|
|
||||||
"info": {
|
|
||||||
"author": {
|
|
||||||
"name": "Grafana Project",
|
|
||||||
"url": "https://grafana.com"
|
|
||||||
},
|
|
||||||
"logos": {
|
|
||||||
"small": "img/icn-singlestat-panel.svg",
|
|
||||||
"large": "img/icn-singlestat-panel.svg"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user