luisgulo/focalboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return JSON empty array when not found, and handle null arrays

Browse source
This commit is contained in:
Chen-I Lim 2021-03-08 16:08:17 -08:00
parent d0adb9c4db
commit af7f666eff
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/services/store/sqlstore/blocks.go
View file

@ -218,7 +218,7 @@ func (s *SQLStore) GetAllBlocks() ([]model.Block, error) {
func blocksFromRows(rows *sql.Rows) ([]model.Block, error) { func blocksFromRows(rows *sql.Rows) ([]model.Block, error) {
defer rows.Close() defer rows.Close()
var results []model.Block var results = []model.Block{}
for rows.Next() { for rows.Next() {
var block model.Block var block model.Block

3
webapp/src/octoClient.ts
View file

@ -28,7 +28,8 @@ class OctoClient {
private async getJson(response: Response, defaultValue: any = {}): Promise<any> { private async getJson(response: Response, defaultValue: any = {}): Promise<any> {
// The server may return null or malformed json // The server may return null or malformed json
try { try {
return await response.json() const value = await response.json()
return value || defaultValue
} catch { } catch {
return defaultValue return defaultValue
} }