dashboard: refactor logic for retrieving url for folder/dashboard

2018-01-31 23:14:48 +01:00
parent c19f4a866f
commit 90933b0621
3 changed files with 18 additions and 20 deletions
@@ -258,17 +258,11 @@ func makeQueryResult(query *search.FindPersistedDashboardsQuery, res []Dashboard
 	for _, item := range res {
 		hit, exists := hits[item.Id]
 		if !exists {
-			var url string
-			if item.IsFolder {
-				url = m.GetFolderUrl(item.Uid, item.Slug)
-			} else {
-				url = m.GetDashboardUrl(item.Uid, item.Slug)
-			}
 			hit = &search.Hit{
 				Id:          item.Id,
 				Title:       item.Title,
 				Uri:         "db/" + item.Slug,
-				Url:         url,
+				Url:         m.GetDashboardFolderUrl(item.IsFolder, item.Uid, item.Slug),
 				Slug:        item.Slug,
 				Type:        getHitType(item),
 				FolderId:    item.FolderId,