IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove Macaron ParamsInt64 function from code base (#43810)

Browse Source 
* draft commit

* change all calls

* Compilation errors
This commit is contained in:
ying-jeanne
2022-01-14 17:55:57 +01:00
committed by GitHub
parent bd8791aced
commit 7422789ec7
33 changed files with 454 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/api/folder.go
View File

@@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"net/http"
"strconv"
"github.com/grafana/grafana/pkg/api/apierrors"
"github.com/grafana/grafana/pkg/api/dtos"
@@ -51,7 +52,13 @@ func (hs *HTTPServer) GetFolderByUID(c *models.ReqContext) response.Response {
func (hs *HTTPServer) GetFolderByID(c *models.ReqContext) response.Response {
s := dashboards.NewFolderService(c.OrgId, c.SignedInUser, hs.SQLStore)
folder, err := s.GetFolderByID(c.Req.Context(), c.ParamsInt64(":id"))
id, err := strconv.ParseInt(web.Params(c.Req)[":id"], 10, 64)
if err != nil {
return response.Error(http.StatusBadRequest, "id is invalid", err)
}
folder, err := s.GetFolderByID(c.Req.Context(), id)
if err != nil {
return apierrors.ToFolderErrorResponse(err)
}