Merge branch 'master' of https://github.com/utkarshcmu/grafana into snapshot-view

2016-01-19 21:05:50 -08:00
parent e26cd21048 36e99ac531
commit 09f5e6f4dc
12 changed files with 97 additions and 73 deletions
@@ -12,17 +12,19 @@ type AppSettings struct {
 	Pinned   bool                     `json:"pinned"`
 	Module   string                   `json:"module"`
 	Info     *plugins.PluginInfo      `json:"info"`
-	Pages    []*plugins.AppPluginPage `json:"pages"`
+	Pages    []plugins.AppPluginPage  `json:"pages"`
+	Includes []plugins.AppIncludeInfo `json:"includes"`
 	JsonData map[string]interface{}   `json:"jsonData"`
 }

 func NewAppSettingsDto(def *plugins.AppPlugin, data *models.AppSettings) *AppSettings {
 	dto := &AppSettings{
-		AppId:  def.Id,
-		Name:   def.Name,
-		Info:   &def.Info,
-		Module: def.Module,
-		Pages:  def.Pages,
+		AppId:    def.Id,
+		Name:     def.Name,
+		Info:     &def.Info,
+		Module:   def.Module,
+		Pages:    def.Pages,
+		Includes: def.Includes,
 	}

 	if data != nil {