mirror of
https://github.com/grafana/grafana.git
synced 2025-09-26 05:53:52 +08:00
@ -186,7 +186,7 @@ func (l *Loader) loadPlugins(ctx context.Context, class plugins.Class, pluginJSO
|
|||||||
}
|
}
|
||||||
|
|
||||||
if plugin.Parent != nil && plugin.Parent.IsApp() {
|
if plugin.Parent != nil && plugin.Parent.IsApp() {
|
||||||
configureAppChildOPlugin(plugin.Parent, plugin)
|
configureAppChildPlugin(plugin.Parent, plugin)
|
||||||
}
|
}
|
||||||
|
|
||||||
verifiedPlugins = append(verifiedPlugins, plugin)
|
verifiedPlugins = append(verifiedPlugins, plugin)
|
||||||
@ -365,7 +365,7 @@ func setDefaultNavURL(p *plugins.Plugin) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func configureAppChildOPlugin(parent *plugins.Plugin, child *plugins.Plugin) {
|
func configureAppChildPlugin(parent *plugins.Plugin, child *plugins.Plugin) {
|
||||||
if !parent.IsApp() {
|
if !parent.IsApp() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -1311,7 +1311,7 @@ func Test_setPathsBasedOnApp(t *testing.T) {
|
|||||||
BaseURL: "public/app/plugins/app/testdata-app",
|
BaseURL: "public/app/plugins/app/testdata-app",
|
||||||
}
|
}
|
||||||
|
|
||||||
configureAppChildOPlugin(parent, child)
|
configureAppChildPlugin(parent, child)
|
||||||
|
|
||||||
require.Equal(t, "app/plugins/app/testdata-app/datasources/datasource/module", child.Module)
|
require.Equal(t, "app/plugins/app/testdata-app/datasources/datasource/module", child.Module)
|
||||||
require.Equal(t, "testdata-app", child.IncludedInAppID)
|
require.Equal(t, "testdata-app", child.IncludedInAppID)
|
||||||
|
Reference in New Issue
Block a user