Commit 305a6ae1 by Torkel Ödegaard

feat(dashboards): dashboard sharing fixes

parent 10daf1d6
...@@ -107,4 +107,8 @@ func addDashboardMigration(mg *Migrator) { ...@@ -107,4 +107,8 @@ func addDashboardMigration(mg *Migrator) {
mg.AddMigration("Add column gnetId in dashboard", NewAddColumnMigration(dashboardV2, &Column{ mg.AddMigration("Add column gnetId in dashboard", NewAddColumnMigration(dashboardV2, &Column{
Name: "gnet_id", Type: DB_BigInt, Nullable: true, 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,
}))
} }
...@@ -69,9 +69,7 @@ export class DashImportCtrl { ...@@ -69,9 +69,7 @@ export class DashImportCtrl {
if (sources.length === 0) { if (sources.length === 0) {
inputModel.info = "No data sources of type " + input.pluginName + " found"; inputModel.info = "No data sources of type " + input.pluginName + " found";
} else if (inputModel.description) { } else if (!inputModel.info) {
inputModel.info = inputModel.description;
} else {
inputModel.info = "Select a " + input.pluginName + " data source"; inputModel.info = "Select a " + input.pluginName + " data source";
} }
......
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