Merge branch 'dashboard-search-permissions-filter'

2025-02-25 18:55:37 -06:00 · 2018-02-14 10:48:55 +01:00
parent b60b6690ba 162439a8d6
commit 8dd4d505ee
13 changed files with 132 additions and 136 deletions
--- a/public/app/features/dashboard/folder_picker/folder_picker.ts
+++ b/public/app/features/dashboard/folder_picker/folder_picker.ts
@@ -30,7 +30,13 @@ export class FolderPickerCtrl {
  }

  getOptions(query) {
-    return this.backendSrv.get('api/dashboards/folders', { query: query }).then(result => {
+    const params = {
+      query: query,
+      type: 'dash-folder',
+      permission: 'Edit',
+    };
+
+    return this.backendSrv.get('api/search', params).then(result => {
      if (
        query === '' ||
        query.toLowerCase() === 'g' ||