move Context and session out of middleware

2018-03-06 18:16:49 -05:00
parent 8e81dc1e79
commit 338655dd37
66 changed files with 611 additions and 600 deletions
@@ -4,12 +4,11 @@ import (
 	"strings"

 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 )

-func AdminGetSettings(c *middleware.Context) {
+func AdminGetSettings(c *m.Context) {
 	settings := make(map[string]interface{})

 	for _, section := range setting.Cfg.Sections() {
@@ -30,7 +29,7 @@ func AdminGetSettings(c *middleware.Context) {
 	c.JSON(200, settings)
 }

-func AdminGetStats(c *middleware.Context) {
+func AdminGetStats(c *m.Context) {

 	statsQuery := m.GetAdminStatsQuery{}