feat(dashboards): dashboard sharing fixes

torkelo · torkelo · commit 305a6ae11018 · 2016-06-17T11:36:35.000+02:00
diff --git 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
@@ -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";
     }
 

Original file line number	Diff line number	Diff line change
`@@ -107,4 +107,8 @@ func addDashboardMigration(mg *Migrator) {`
`107`	`107`	`mg.AddMigration("Add column gnetId in dashboard", NewAddColumnMigration(dashboardV2, &Column{`
`108`	`108`	`Name: "gnet_id", Type: DB_BigInt, Nullable: true,`
`109`	`109`	`}))`
	`110`	`+`
	`111`	`+ mg.AddMigration("Add index for gnetId in dashboard", NewAddIndexMigration(dashboardV2, &Index{`
	`112`	`+ Cols: []string{"gnet_id"}, Type: IndexType,`
	`113`	`+ }))`
`110`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,7 @@ export class DashImportCtrl {`
`69`	`69`
`70`	`70`	`if (sources.length === 0) {`
`71`	`71`	`inputModel.info = "No data sources of type " + input.pluginName + " found";`
`72`		`- } else if (inputModel.description) {`
`73`		`- inputModel.info = inputModel.description;`
`74`		`- } else {`
	`72`	`+ } else if (!inputModel.info) {`
`75`	`73`	`inputModel.info = "Select a " + input.pluginName + " data source";`
`76`	`74`	`}`
`77`	`75`