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

Merge pull request #13208 from grafana/fix-dashboard-permissions

Browse Source 
fix: Dashboard permissions now shows correctly
This commit is contained in:
Marcus Efraimsson 2018-09-10 14:00:55 +02:00 committed by GitHub
commit 35a24032a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/features/dashboard/folder_picker/folder_picker.ts
View File

@ -131,6 +131,7 @@ export class FolderPickerCtrl {
private loadInitialValue() { private loadInitialValue() {
const resetFolder = { text: this.initialTitle, value: null }; const resetFolder = { text: this.initialTitle, value: null };
const rootFolder = { text: this.rootName, value: 0 }; const rootFolder = { text: this.rootName, value: 0 };
this.getOptions('').then(result => { this.getOptions('').then(result => {
let folder; let folder;
if (this.initialFolderId) { if (this.initialFolderId) {
@ -150,7 +151,7 @@ export class FolderPickerCtrl {
this.folder = folder; this.folder = folder;
// if this is not the same as our initial value notify parent // if this is not the same as our initial value notify parent
if (this.folder.id !== this.initialFolderId) { if (this.folder.value !== this.initialFolderId) {
this.onChange({ $folder: { id: this.folder.value, title: this.folder.text } }); this.onChange({ $folder: { id: this.folder.value, title: this.folder.text } });
} }
}); });