From d03949a735fd6ee486e278feb3b87f252be5ce96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 6 Jan 2015 18:38:48 +0100
Subject: [PATCH] Worked on dashboard and tag search through backend

---
 src/app/features/grafanaDatasource/datasource.js | 6 ++----
 src/app/partials/search.html                     | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/features/grafanaDatasource/datasource.js b/src/app/features/grafanaDatasource/datasource.js
index f3ec1569352..c96199ce168 100644
--- a/src/app/features/grafanaDatasource/datasource.js
+++ b/src/app/features/grafanaDatasource/datasource.js
@@ -65,12 +65,10 @@ function (angular, _, kbn) {
     GrafanaDatasource.prototype.searchDashboards = function(query) {
       return backendSrv.get('/api/search/', { q: query } )
         .then(function(data) {
-          var hits = { dashboards: [], tags: [] };
-          hits.dashboards = _.map(data, function(item) {
+          _.each(data.dashboards, function(item) {
             item.id = item.slug;
-            return item;
           });
-          return hits;
+          return data;
         });
     };
 
diff --git a/src/app/partials/search.html b/src/app/partials/search.html
index 2d220b206fd..7cdccba793a 100644
--- a/src/app/partials/search.html
+++ b/src/app/partials/search.html
@@ -30,7 +30,6 @@
 	</div>
 
 	<div ng-if="!showImport">
-		<h6 ng-hide="results.dashboards.length">No dashboards matching your query were found.</h6>
 		<div class="search-results-container" ng-if="tagsOnly">
 			<div class="row">
 				<div class="span6 offset1">
@@ -47,6 +46,8 @@
 		</div>
 
 		<div class="search-results-container" ng-if="!tagsOnly">
+			<h6 ng-hide="results.dashboards.length">No dashboards matching your query were found.</h6>
+
 			<div class="search-result-item pointer" bindonce ng-repeat="row in results.dashboards"
 				ng-class="{'selected': $index === selectedIndex }" ng-click="goToDashboard(row.id)">