Dashlist: Fixed dashlist broken in edit mode (#23426)

363bf750 · Torkel Ödegaard · GitHub · 04d3c3aa · 363bf750
Commit 363bf750 authored Apr 08, 2020 by Torkel Ödegaard Committed by GitHub Apr 08, 2020
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

public/app/core/components/Select/FolderPicker.tsx
+1 -1

No files found.
--- a/public/app/core/components/Select/FolderPicker.tsx
+++ b/public/app/core/components/Select/FolderPicker.tsx
@@ -110,7 +110,7 @@ export class FolderPicker extends PureComponent<Props, State> {

    let folder: SelectableValue<number> = { value: -1 };

-    if (initialFolderId !== undefined && initialFolderId > -1) {
+    if (initialFolderId !== undefined && initialFolderId !== null && initialFolderId > -1) {
      folder = options.find(option => option.value === initialFolderId) || { value: -1 };
    } else if (enableReset && initialTitle) {
      folder = resetFolder;