Updated dashboard links feature to support search by my multiple tags, #1944

This commit is contained in:
Torkel Ödegaard
2015-06-02 10:35:10 +02:00
parent dc607b8e8a
commit 6df9012141
2 changed files with 5 additions and 4 deletions
+2 -1
View File
@@ -25,7 +25,8 @@
<li class="tight-form-item" ng-show="link.type === 'dashboards'">With tag</li>
<li ng-show="link.type === 'dashboards'">
<input type="text" ng-model="link.tag" class="input-small tight-form-input" style="width: 151px" ng-model-onblur ng-change="updated()">
<bootstrap-tagsinput ng-model="link.tags" tagclass="label label-tag" placeholder="add tags">
</bootstrap-tagsinput>
</li>
<li class="tight-form-item" ng-show="link.type === 'dashboards'">
<editor-checkbox text="As dropdown" model="link.asDropdown" change="updated()"></editor-checkbox>
+3 -3
View File
@@ -89,7 +89,7 @@ function (angular, _) {
function buildLinks(linkDef) {
if (linkDef.type === 'dashboards') {
if (!linkDef.tag) {
if (!linkDef.tags) {
console.log('Dashboard link missing tag');
return $q.when([]);
}
@@ -97,7 +97,7 @@ function (angular, _) {
if (linkDef.asDropdown) {
return $q.when([{
title: linkDef.title,
tag: linkDef.tag,
tags: linkDef.tags,
keepTime: linkDef.keepTime,
includeVars: linkDef.includeVars,
icon: "fa fa-bars",
@@ -132,7 +132,7 @@ function (angular, _) {
}
$scope.searchDashboards = function(link) {
return backendSrv.search({tag: link.tag}).then(function(results) {
return backendSrv.search({tag: link.tags}).then(function(results) {
return _.reduce(results, function(memo, dash) {
// do not add current dashboard
if (dash.id !== currentDashId) {