* luci-0.8: merge r3727

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index 9967ce933aa82672577a092dbc5195951655f409..e0e2b1cbcefb45333ff7b8040863274baecc5d09 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -48,7 +48,7 @@ s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
 
 s:option(Value, "hostname", translate("hostname"))
 
-tz = s:option(ListValue, "timezone", translate("timezone"))
+tz = s:option(Value, "timezone", translate("timezone"))
 for k, offset in luci.util.vspairs(luci.http.protocol.date.TZ) do
        local zone = k:upper()  
        local osgn = (offset >= 0 and "" or "+")

diff --git a/modules/admin-mini/luasrc/model/cbi/mini/system.lua b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
index c9e8c7f6f50fbd37830c0fef435dd53b386eeaed..a1ed1282cf8ee3adfc60e657c842adea1cfa3994 100644 (file)
--- a/modules/admin-mini/luasrc/model/cbi/mini/system.lua
+++ b/modules/admin-mini/luasrc/model/cbi/mini/system.lua
@@ -55,7 +55,7 @@ s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
 
 s:option(Value, "hostname", translate("hostname"))
 
-tz = s:option(ListValue, "timezone", translate("timezone"))
+tz = s:option(Value, "timezone", translate("timezone"))
 for k, offset in luci.util.vspairs(luci.http.protocol.date.TZ) do
        local zone = k:upper()  
        local osgn = (offset >= 0 and "" or "+")