Worked on dashboard and tag search through backend

pull/1442/head
Torkel Ödegaard 11 years ago
parent a5c8bbfe1f
commit d03949a735
  1. 6
      src/app/features/grafanaDatasource/datasource.js
  2. 3
      src/app/partials/search.html

@ -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;
});
};

@ -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)">

Loading…
Cancel
Save