Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1735 from sumpfralle/olsr-jsoninfo-parser-handle-empty-result

Browse source 
luci-app-olsr: handle empty result for non-status tables
This commit is contained in:
Florian Eckert 2019-09-23 09:04:17 +02:00 committed by GitHub
commit cf239f9e10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
applications/luci-app-olsr/luasrc/controller/olsr.lua
View file

@ -379,9 +379,9 @@ function fetch_jsoninfo(otable)
if jsonreq4 ~= "" then if jsonreq4 ~= "" then
has_v4 = 1 has_v4 = 1
jsondata4 = json.decode(jsonreq4) jsondata4 = json.decode(jsonreq4) or {}
if otable == 'status' then if otable == 'status' then
data4 = jsondata4 or {} data4 = jsondata4
else else
data4 = jsondata4[otable] or {} data4 = jsondata4[otable] or {}
end end
@ -393,9 +393,9 @@ function fetch_jsoninfo(otable)
end end
if jsonreq6 ~= "" then if jsonreq6 ~= "" then
has_v6 = 1 has_v6 = 1
jsondata6 = json.decode(jsonreq6) jsondata6 = json.decode(jsonreq6) or {}
if otable == 'status' then if otable == 'status' then
data6 = jsondata6 or {} data6 = jsondata6
else else
data6 = jsondata6[otable] or {} data6 = jsondata6[otable] or {}
end end