make it easier for dashboards to generate ur;

pull/10715/head
bergquist 7 years ago
parent 74ca6f6dbf
commit fcd86fb24f
  1. 2
      pkg/api/alerting.go
  2. 5
      pkg/models/dashboards.go

@ -105,7 +105,7 @@ func transformToDTOs(alerts []*models.Alert, c *middleware.Context) ([]*dtos.Ale
for _, alert := range alertDTOs {
for _, dash := range dashboardsQuery.Result {
if alert.DashboardId == dash.Id {
alert.DashbboardUri = models.GetDashboardUrl(dash.Uid, dash.Slug)
alert.DashbboardUri = dash.GenerateUrl()
break
}
}

@ -162,6 +162,11 @@ func (dash *Dashboard) GetUrl() string {
return GetDashboardFolderUrl(dash.IsFolder, dash.Uid, dash.Slug)
}
// Return the html url for a dashboard
func (dash *Dashboard) GenerateUrl() string {
return GetDashboardUrl(dash.Uid, dash.Slug)
}
// GetDashboardFolderUrl return the html url for a folder if it's folder, otherwise for a dashboard
func GetDashboardFolderUrl(isFolder bool, uid string, slug string) string {
if isFolder {

Loading…
Cancel
Save