Commit 923df824 by ubhatnagar

Search Dashboard Panel will hide if 'Manage Dashboards' is clicked.

parent 9af46060
...@@ -51,8 +51,9 @@ function (angular, _) { ...@@ -51,8 +51,9 @@ function (angular, _) {
$scope.exitFullscreen(); $scope.exitFullscreen();
}; };
$scope.removeToolTip = function() { $scope.manageButtonClickAction = function() {
$('.tooltip').not(this).hide(); $('.tooltip').not(this).hide();
$scope.appEvent('hide-dash-search');
}; };
$scope.saveDashboard = function(options) { $scope.saveDashboard = function(options) {
......
...@@ -54,7 +54,14 @@ function (angular, $) { ...@@ -54,7 +54,14 @@ function (angular, $) {
hookUpHideWhenClickedOutside(); hookUpHideWhenClickedOutside();
} }
function hideSearch() {
if (editorScope) {
editorScope.dismiss();
}
}
scope.onAppEvent('show-dash-search', showSearch); scope.onAppEvent('show-dash-search', showSearch);
scope.onAppEvent('hide-dash-search', hideSearch);
} }
}; };
}); });
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a> <a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
</li> </li>
<li class="dropdown"> <li class="dropdown">
<a class="pointer" ng-click="removeToolTip()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a> <a class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li> <li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li> <li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment