Changeset 6629

Timestamp:

12/06/10 00:47:08 (2 years ago)

Author:

soma

Message:

applications/luci-olsr: Fix problem with float values

Location:

luci/trunk/applications/luci-olsr/luasrc/model/cbi/olsr

Files:

• olsrd.lua (modified) (11 diffs)
• olsrdiface.lua (modified) (9 diffs)

luci/trunk/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua

@@ -36 +36 @@
 end
 
+function write_float(self, section, value)
+    local n = tonumber(value)
+    if n ~= nil then
+        return Value.write(self, section, "%.1f" % n) 
+    end
+end
+
 s = m:section(TypedSection, "olsrd", translate("General settings"))
---s.dynamic = true
 s.anonymous = true
 
@@ -123 +129 @@
 hyst:depends("LinkQualityLevel", "0")
 hyst.optional = true
+hyst.rmempty = true
 
 port = s:taboption("general", Value, "OlsrPort", translate("Port"),
@@ -158 +165 @@
 natthr:depends("LinkQualityAlgorithm", "etx_float")
 natthr:depends("LinkQualityAlgorithm", "etx_fpm")
-natthr.default = 1
+natthr.default = "1.0"
 natthr.optional = true
+natthr.write = write_float
 
 
@@ -231 +239 @@
 hi.datatype = "ufloat"
 hi.placeholder = "5.0"
+hi.write = write_float
 
 hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
@@ -236 +245 @@
 hv.datatype = "ufloat"
 hv.placeholder = "40.0"
+hv.write = write_float
 
 ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
@@ -241 +251 @@
 ti.datatype = "ufloat"
 ti.placeholder = "2.0"
+ti.write = write_float
 
 tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
@@ -246 +257 @@
 tv.datatype = "ufloat"
 tv.placeholder = "256.0"
+tv.write = write_float
 
 mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
@@ -251 +263 @@
 mi.datatype = "ufloat"
 mi.placeholder = "18.0"
+mi.write = write_float
 
 mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
@@ -256 +269 @@
 mv.datatype = "ufloat"
 mv.placeholder = "324.0"
+mv.write = write_float
 
 ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
@@ -261 +275 @@
 ai.datatype = "ufloat"
 ai.placeholder = "18.0"
+ai.write = write_float
 
 av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
@@ -266 +281 @@
 av.datatype = "ufloat"
 av.placeholder = "108.0"
+av.write = write_float
 
 

luci/trunk/applications/luci-olsr/luasrc/model/cbi/olsr/olsrdiface.lua

@@ -13 +13 @@
 
 ]]--
+
+function write_float(self, section, value)
+    local n = tonumber(value)
+    if n ~= nil then
+        return Value.write(self, section, "%.1f" % n)
+    end
+end
 
 m = Map("olsrd", translate("OLSR Daemon - Interface"),
@@ -107 +114 @@
 ip6s.placeholder = "0::/0"
 
-
 hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
 hi.optional = true
 hi.datatype = "ufloat"
 hi.placeholder = "5.0"
+hi.write = write_float
 
 hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
@@ -117 +124 @@
 hv.datatype = "ufloat"
 hv.placeholder = "40.0"
+hv.write = write_float
 
 ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
@@ -122 +130 @@
 ti.datatype = "ufloat"
 ti.placeholder = "2.0"
+ti.write = write_float
 
 tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
@@ -127 +136 @@
 tv.datatype = "ufloat"
 tv.placeholder = "256.0"
+tv.write = write_float
 
 mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
@@ -132 +142 @@
 mi.datatype = "ufloat"
 mi.placeholder = "18.0"
+mi.write = write_float
 
 mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
@@ -137 +148 @@
 mv.datatype = "ufloat"
 mv.placeholder = "324.0"
+mv.write = write_float
 
 ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
@@ -142 +154 @@
 ai.datatype = "ufloat"
 ai.placeholder = "18.0"
+ai.write = write_float
 
 av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
@@ -147 +160 @@
 av.datatype = "ufloat"
 av.placeholder = "108.0"
-
+av.write = write_float
 
 return m