self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2025-07-03 23:30:29 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/main' into auth

Browse Source
This commit is contained in:
Jesús Espino
2020-11-17 15:44:04 +01:00
parent a1008fee1c b1b6d5b070
commit 11d336fef0
83 changed files with 2521 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/api/api.go
View File

@ -8,6 +8,7 @@ import (
"log"
"net/http"
"path/filepath"
"strconv"
"strings"
"github.com/gorilla/mux"
@ -155,7 +156,21 @@ func (a *API) handleGetSubTree(w http.ResponseWriter, r *http.Request) {
vars := mux.Vars(r)
blockID := vars["blockID"]
blocks, err := a.app().GetSubTree(blockID)
query := r.URL.Query()
levels, err := strconv.ParseInt(query.Get("l"), 10, 32)
if err != nil {
levels = 2
}
if levels != 2 && levels != 3 {
log.Printf(`ERROR Invalid levels: %d`, levels)
errorData := map[string]string{"description": "invalid levels"}
errorResponse(w, http.StatusInternalServerError, errorData)
return
}
blocks, err := a.app().GetSubTree(blockID, int(levels))
if err != nil {
log.Printf(`ERROR: %v`, r)
errorResponse(w, http.StatusInternalServerError, nil)
@ -163,7 +178,7 @@ func (a *API) handleGetSubTree(w http.ResponseWriter, r *http.Request) {
return
}
log.Printf("GetSubTree blockID: %s, %d result(s)", blockID, len(blocks))
log.Printf("GetSubTree (%v) blockID: %s, %d result(s)", levels, blockID, len(blocks))
json, err := json.Marshal(blocks)
if err != nil {
log.Printf(`ERROR json.Marshal: %v`, r)
@ -302,7 +317,7 @@ func errorResponse(w http.ResponseWriter, code int, message map[string]string) {
data = []byte("{}")
}
w.WriteHeader(code)
fmt.Fprint(w, data)
w.Write(data)
}
func addUserID(rw http.ResponseWriter, req *http.Request, next http.Handler) {