From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 10 Feb 2016 18:36:37 +0000 (+0100)
Subject: luci-base: cbi: rely on auto-serialization for combobox choices
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b09d39e9ccd2a048353e9415497b0d3efe580f1;p=project%2Fluci.git

luci-base: cbi: rely on auto-serialization for combobox choices

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---

diff --git a/modules/luci-base/luasrc/view/cbi/value.htm b/modules/luci-base/luasrc/view/cbi/value.htm
index e6e0287ef3..c8c905eb11 100644
--- a/modules/luci-base/luasrc/view/cbi/value.htm
+++ b/modules/luci-base/luasrc/view/cbi/value.htm
@@ -12,7 +12,7 @@
 		ifattr(self.datatype, "data-type", self.datatype) ..
 		ifattr(self.datatype, "data-optional", self.optional or self.rmempty) ..
 		ifattr(self.combobox_manual, "data-manual", self.combobox_manual) ..
-		ifattr(#self.keylist > 0, "data-choices", luci.util.serialize_json({ self.keylist, self.vallist }))
+		ifattr(#self.keylist > 0, "data-choices", { self.keylist, self.vallist })
 	%> />
 	<% if self.password then %><img src="<%=resource%>/cbi/reload.gif" style="vertical-align:middle" title="<%:Reveal/hide password%>" onclick="var e = document.getElementById('<%=cbid%>'); e.type = (e.type=='password') ? 'text' : 'password';" /><% end %>
 <%+cbi/valuefooter%>