mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
fix: FolderId and IsFolder when saving dashboard
This commit is contained in:
@@ -23,9 +23,7 @@ func SetRepository(rep Repository) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type SaveDashboardItem struct {
|
type SaveDashboardItem struct {
|
||||||
TitleLower string
|
|
||||||
OrgId int64
|
OrgId int64
|
||||||
Folder string
|
|
||||||
UpdatedAt time.Time
|
UpdatedAt time.Time
|
||||||
UserId int64
|
UserId int64
|
||||||
Message string
|
Message string
|
||||||
@@ -57,6 +55,8 @@ func (dr *DashboardRepository) SaveDashboard(json *SaveDashboardItem) (*models.D
|
|||||||
OrgId: json.OrgId,
|
OrgId: json.OrgId,
|
||||||
Overwrite: json.Overwrite,
|
Overwrite: json.Overwrite,
|
||||||
UserId: json.UserId,
|
UserId: json.UserId,
|
||||||
|
FolderId: dashboard.FolderId,
|
||||||
|
IsFolder: dashboard.IsFolder,
|
||||||
}
|
}
|
||||||
|
|
||||||
if !json.UpdatedAt.IsZero() {
|
if !json.UpdatedAt.IsZero() {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package dashboards
|
package dashboards
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"strings"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/components/simplejson"
|
"github.com/grafana/grafana/pkg/components/simplejson"
|
||||||
@@ -23,11 +22,9 @@ func createDashboardJson(data *simplejson.Json, lastModified time.Time, cfg *Das
|
|||||||
|
|
||||||
dash := &dashboards.SaveDashboardItem{}
|
dash := &dashboards.SaveDashboardItem{}
|
||||||
dash.Dashboard = models.NewDashboardFromJson(data)
|
dash.Dashboard = models.NewDashboardFromJson(data)
|
||||||
dash.TitleLower = strings.ToLower(dash.Dashboard.Title)
|
|
||||||
dash.UpdatedAt = lastModified
|
dash.UpdatedAt = lastModified
|
||||||
dash.Overwrite = true
|
dash.Overwrite = true
|
||||||
dash.OrgId = cfg.OrgId
|
dash.OrgId = cfg.OrgId
|
||||||
dash.Folder = cfg.Folder
|
|
||||||
dash.Dashboard.Data.Set("editable", cfg.Editable)
|
dash.Dashboard.Data.Set("editable", cfg.Editable)
|
||||||
|
|
||||||
if dash.Dashboard.Title == "" {
|
if dash.Dashboard.Title == "" {
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ export class SearchResultsCtrl {
|
|||||||
|
|
||||||
/** @ngInject */
|
/** @ngInject */
|
||||||
constructor(private $location) {
|
constructor(private $location) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleFolderExpand(section) {
|
toggleFolderExpand(section) {
|
||||||
|
|||||||
Reference in New Issue
Block a user