opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 03:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix build-in plugins failing to load in windows (#25982)

Browse Source
This commit is contained in:
Sofia Papagiannaki
2020-07-01 18:23:18 +03:00
committed by GitHub
parent 039367336c
commit bcaa42fbb3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/plugins/frontend_plugin.go
View File

@ -3,6 +3,7 @@ package plugins
import ( import (
"net/url" "net/url"
"path" "path"
"path/filepath"
"strings" "strings"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
@ -63,7 +64,9 @@ func (fp *FrontendPluginBase) handleModuleDefaults() {
// Previously there was an assumption that the plugin directory // Previously there was an assumption that the plugin directory
// should be public/app/plugins/<plugin type>/<plugin id> // should be public/app/plugins/<plugin type>/<plugin id>
// However this can be an issue if the plugin directory should be renamed to something else // However this can be an issue if the plugin directory should be renamed to something else
currentDir := path.Base(fp.PluginDir) currentDir := filepath.Base(fp.PluginDir)
// use path package for the following statements
// because these are not file paths
fp.Module = path.Join("app/plugins", fp.Type, currentDir, "module") fp.Module = path.Join("app/plugins", fp.Type, currentDir, "module")
fp.BaseUrl = path.Join("public/app/plugins", fp.Type, currentDir) fp.BaseUrl = path.Join("public/app/plugins", fp.Type, currentDir)
} }