summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2016-02-10 19:38:33 +0100
committerJo-Philipp Wich <jow@openwrt.org>2016-02-10 19:38:44 +0100
commit5cfad4338f4749aee0a8d81e3b3727ec6630485d (patch)
tree14d61b531efc5bc9878e44e77834a513b9fec0bf /applications
parent5b09d39e9ccd2a048353e9415497b0d3efe580f1 (diff)
luci-app-firewall: rely on auto-serialization for combobox choices
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm2
-rw-r--r--applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm2
2 files changed, 2 insertions, 2 deletions
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
index 4a5bcfd6f..b3079f3a4 100644
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addforward.htm
@@ -61,7 +61,7 @@
</td>
<td class="cbi-section-table-cell" style="width:110px">
<input type="text" class="cbi-input-text" id="_newfwd.intaddr" name="_newfwd.intaddr" data-type="host" data-optional="true"<%=
- ifattr(#keys > 0, "data-choices", luci.util.serialize_json({keys, vals}))
+ ifattr(#keys > 0, "data-choices", {keys, vals})
%>/>
</td>
<td class="cbi-section-table-cell" style="width:110px">
diff --git a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
index 817c046c8..ce275111d 100644
--- a/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
+++ b/applications/luci-app-firewall/luasrc/view/firewall/cbi_addsnat.htm
@@ -48,7 +48,7 @@
</td>
<td class="cbi-section-table-cell" style="width:110px">
<input type="text" class="cbi-input-text" id="_newsnat.dip" name="_newsnat.dip" placeholder="<%:Do not rewrite%>" data-type="ip4addr" data-optional="true"<%=
- ifattr(#keys > 0, "data-choices", luci.util.serialize_json({ keys, vals }))
+ ifattr(#keys > 0, "data-choices", { keys, vals })
%> />
</td>
<td class="cbi-section-table-cell" style="width:110px">