From 305a6ae11018ed69ed29920d3dd3290c4033c7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 17 Jun 2016 11:36:35 +0200 Subject: [PATCH] feat(dashboards): dashboard sharing fixes --- pkg/services/sqlstore/migrations/dashboard_mig.go | 4 ++++ public/app/features/dashboard/import/dash_import.ts | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/services/sqlstore/migrations/dashboard_mig.go b/pkg/services/sqlstore/migrations/dashboard_mig.go index 536b153c6c9..38c25a315f2 100644 --- a/pkg/services/sqlstore/migrations/dashboard_mig.go +++ b/pkg/services/sqlstore/migrations/dashboard_mig.go @@ -107,4 +107,8 @@ func addDashboardMigration(mg *Migrator) { mg.AddMigration("Add column gnetId in dashboard", NewAddColumnMigration(dashboardV2, &Column{ Name: "gnet_id", Type: DB_BigInt, Nullable: true, })) + + mg.AddMigration("Add index for gnetId in dashboard", NewAddIndexMigration(dashboardV2, &Index{ + Cols: []string{"gnet_id"}, Type: IndexType, + })) } diff --git a/public/app/features/dashboard/import/dash_import.ts b/public/app/features/dashboard/import/dash_import.ts index 264df3cd5a9..a0856814e94 100644 --- a/public/app/features/dashboard/import/dash_import.ts +++ b/public/app/features/dashboard/import/dash_import.ts @@ -69,9 +69,7 @@ export class DashImportCtrl { if (sources.length === 0) { inputModel.info = "No data sources of type " + input.pluginName + " found"; - } else if (inputModel.description) { - inputModel.info = inputModel.description; - } else { + } else if (!inputModel.info) { inputModel.info = "Select a " + input.pluginName + " data source"; }