Merge branch 'data-source-instance-to-react' of…

Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react

pkg/api/frontendsettings.go

@@ -22,7 +22,20 @@ func getFrontendSettingsMap(c *m.ReqContext) (map[string]interface{}, error) {
 			return nil, err
 			return nil, err
 		}
 		}
 
 
+		dsFilterQuery := m.DatasourcesPermissionFilterQuery{
+			User:        c.SignedInUser,
+			Datasources: query.Result,
+		}
+
+		if err := bus.Dispatch(&dsFilterQuery); err != nil {
+			if err != bus.ErrHandlerNotFound {
+				return nil, err
+			}
+
 			orgDataSources = query.Result
 			orgDataSources = query.Result
+		} else {
+			orgDataSources = dsFilterQuery.Result
+		}
 	}
 	}
 
 
 	datasources := make(map[string]interface{})
 	datasources := make(map[string]interface{})