Merge branch 'master' into 10630_folder_api

2025-02-25 18:55:37 -06:00 · 2018-02-12 15:11:58 +01:00
parent 3a906ea335 5af2d09fb3
commit cb8c82f7f6
123 changed files with 1773 additions and 790 deletions
--- a/public/app/core/services/search_srv.ts
+++ b/public/app/core/services/search_srv.ts
@@ -150,9 +150,9 @@ export class SearchSrv {
        if (hit.folderId) {
          section = {
            id: hit.folderId,
-            uid: hit.uid,
+            uid: hit.folderUid,
            title: hit.folderTitle,
-            url: hit.url,
+            url: hit.folderUrl,
            items: [],
            icon: 'fa fa-folder-open',
            toggle: this.toggleFolder.bind(this),