Merge remote-tracking branch 'grafana/master'

grafana · Jun 26, 2015 · 05fc345 · 05fc345
2 parents aba824a + 20d5d0e
commit 05fc345
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/public/app/components/extend-jquery.js b/public/app/components/extend-jquery.js
@@ -24,14 +24,14 @@ function ($, angular, _) {
         $tooltip.appendTo(document.body);
 
         if (opts.compile) {
-          angular.element(document).injector().invoke(function($compile, $rootScope) {
+          angular.element(document).injector().invoke(["$compile", "$rootScope", function($compile, $rootScope) {
             var tmpScope = $rootScope.$new(true);
             _.extend(tmpScope, opts.scopeData);
 
             $compile($tooltip)(tmpScope);
             tmpScope.$digest();
-            //tmpScope.$destroy();
-          });
+            tmpScope.$destroy();
+          }]);
         }
 
         width = $tooltip.outerWidth(true);

diff --git a/public/app/features/dashboard/playlistCtrl.js b/public/app/features/dashboard/playlistCtrl.js
@@ -25,14 +25,14 @@ function (angular, _, config) {
       }
 
       backendSrv.search(query).then(function(results) {
-        $scope.searchHits = results.dashboards;
+        $scope.searchHits = results;
         $scope.filterHits();
       });
     };
 
     $scope.filterHits = function() {
       $scope.filteredHits = _.reject($scope.searchHits, function(dash) {
-        return _.findWhere($scope.playlist, {slug: dash.slug});
+        return _.findWhere($scope.playlist, {uri: dash.uri});
       });
     };
 

diff --git a/public/app/features/dashboard/playlistSrv.js b/public/app/features/dashboard/playlistSrv.js
@@ -18,7 +18,7 @@ function (angular, _, kbn) {
       angular.element(window).unbind('resize');
       var dash = self.dashboards[self.index % self.dashboards.length];
 
-      $location.url('dashboard/db/' + dash.slug);
+      $location.url('dashboard/' + dash.uri);
 
       self.index++;
       self.cancelPromise = $timeout(self.next, self.interval);