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

fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554)

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-07-11 10:58:06 -07:00
committed by GitHub
parent 24f395f986
commit b4e0ace7a2
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,10 +104,7 @@ export class FolderPickerCtrl {
appEvents.emit('alert-success', ['Folder Created', 'OK']);
this.closeCreateFolder();
this.folder = {
text: result.title,
value: result.id,
};
this.folder = { text: result.title, value: result.id };
this.onFolderChange(this.folder);
});
}
@@ -149,17 +146,14 @@ export class FolderPickerCtrl {
folder = result.length > 0 ? result[0] : resetFolder;
}
}
this.folder = folder;
this.onFolderLoad();
});
}
private onFolderLoad() {
if (this.onLoad) {
this.onLoad({
$folder: { id: this.folder.value, title: this.folder.text },
});
this.folder = folder;
// if this is not the same as our initial value notify parent
if (this.folder.id !== this.initialFolderId) {
this.onChange({ $folder: { id: this.folder.value, title: this.folder.text } });
}
});
}
}
@@ -176,7 +170,6 @@ export function folderPicker() {
labelClass: '@',
rootName: '@',
onChange: '&',
onLoad: '&',
onCreateFolder: '&',
enterFolderCreation: '&',
exitFolderCreation: '&',