Merge branch 'master' of github.com:elastic/kibana into migrate/timelion

src/ui/public/directives/saved_object_finder.js

@@ -18,7 +18,9 @@ module.directive('savedObjectFinder', function ($location, $injector, kbnUrl, Pr
       // optional make-url attr, sets the userMakeUrl in our scope
       userMakeUrl: '=?makeUrl',
       // optional on-choose attr, sets the userOnChoose in our scope
-      userOnChoose: '=?onChoose'
+      userOnChoose: '=?onChoose',
+      // optional useLocalManagement attr,  removes link to management section
+      useLocalManagement: '=?useLocalManagement'
     },
     template: savedObjectFinderTemplate,
     controllerAs: 'finder',

src/ui/public/partials/saved_object_finder.html

@@ -18,7 +18,7 @@
       <div class="finder-hit-count col-md-2">
         <span>{{finder.hitCount}} of {{finder.hitCount}}</span>
       </div>
-      <div class="finder-manage-object col-md-2">
+      <div class="finder-manage-object col-md-2" ng-if="!useLocalManagement">
         <a class="small" ng-click="finder.manageObjects(finder.properties.name)">
           Manage {{finder.properties.nouns}}
         </a>