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

Work on making grafana work in sub url

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-01-04 21:03:40 +01:00
parent 9ba34aabab
commit f25a415a9e
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/api.go
View File

@ -4,6 +4,7 @@ import (
"github.com/Unknwon/macaron"
"github.com/torkelo/grafana-pro/pkg/api/dtos"
"github.com/torkelo/grafana-pro/pkg/middleware"
"github.com/torkelo/grafana-pro/pkg/setting"
)
func Register(m *macaron.Macaron) {
@ -36,7 +37,7 @@ func Register(m *macaron.Macaron) {
m.Any("/api/datasources/proxy/:id/*", auth, ProxyDataSourceRequest)
// user register
m.Get("/register/*_", Index)
m.Get("/register", Index)
m.Post("/api/account", CreateAccount)
// dashboards
@ -57,8 +58,10 @@ func Index(ctx *middleware.Context) {
return
}
ctx.Data["user"] = dtos.NewCurrentUser(ctx.UserAccount)
ctx.Data["settings"] = settings
ctx.Data["User"] = dtos.NewCurrentUser(ctx.UserAccount)
ctx.Data["Settings"] = settings
ctx.Data["AppUrl"] = setting.AppUrl
ctx.Data["AppSubUrl"] = setting.AppSubUrl
ctx.HTML(200, "index")
}