opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-31 16:02:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(apps): minor progress

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-01-12 10:20:04 +01:00
parent 2fe58461d5
commit ffe1407217
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/index.go
View File

@ -85,7 +85,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
if plugin.Pinned {
data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
Text: plugin.Name,
Url: setting.AppSubUrl + "/apps/edit/" + plugin.Id,
Url: "/apps/edit/" + plugin.Id,
Img: plugin.Info.Logos.Small,
})
}

15
pkg/plugins/app_plugin.go
View File

@ -26,13 +26,18 @@ type AppPlugin struct {
Enabled bool `json:"-"`
}
func (p *AppPlugin) Load(decoder *json.Decoder, pluginDir string) error {
if err := decoder.Decode(&p); err != nil {
func (app *AppPlugin) Load(decoder *json.Decoder, pluginDir string) error {
if err := decoder.Decode(&app); err != nil {
return err
}
p.PluginDir = pluginDir
p.initFrontendPlugin()
Apps[p.Id] = p
if app.Css != nil {
app.Css.Dark = evalRelativePluginUrlPath(app.Css.Dark, app.Id)
app.Css.Light = evalRelativePluginUrlPath(app.Css.Light, app.Id)
}
app.PluginDir = pluginDir
app.initFrontendPlugin()
Apps[app.Id] = app
return nil
}