Changeset 7229

Timestamp:

06/25/11 22:51:12 (2 years ago)

Author:

jow

Message:

modules/admin-full: defer writing of interface related dhcp options until an actual save occurs, prevents "unsaved changes" upon opening the interface settings page

Files:

• luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua (modified) (5 diffs)

luci/trunk/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua

@@ -3 +3 @@
 
 Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@subsignal.org>
+Copyright 2008-2011 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -660 +660 @@
 if has_dnsmasq and net:proto() == "static" then
     m2 = Map("dhcp", "", "")
+    
+    local section_id = "-"
+
     function m2.on_parse()
-        local has_section = false
-
         m2.uci:foreach("dhcp", "dhcp", function(s)
             if s.interface == arg[1] then
-                has_section = true
+                section_id = s['.name']
                 return false
             end
         end)
-
-        if not has_section then
-            m2.uci:section("dhcp", "dhcp", nil, { interface = arg[1], ignore = "1" })
-            m2.uci:save("dhcp")
-        end
     end
 
@@ -682 +678 @@
     s:tab("advanced", translate("Advanced Settings"))
 
-    function s.filter(self, section)
-        return m2.uci:get("dhcp", section, "interface") == arg[1]
+    function s.cfgsections(self)
+        return { section_id }
     end
 
@@ -692 +688 @@
 
     ignore.rmempty = false
+
+    function ignore.cfgvalue(self, section)
+        return (section == "-") and self.enabled or Flag.cfgvalue(self, section)
+    end
+
+    function ignore.write(self, section, value)
+        section_id = m2.uci:section("dhcp", "dhcp", nil, {
+            ignore    = value,
+            interface = arg[1]
+        })
+    end 
+
 
     local start = s:taboption("general", Value, "start", translate("Start"),
@@ -735 +743 @@
             "192.168.2.2</code>\" which advertises different DNS servers to clients."))
 
+
+    local function write_opt(self, section, value)
+        return getmetatable(self).__index.write(self, section_id, value)
+    end
+
+    local function remove_opt(self, section, value)
+        return getmetatable(self).__index.remove(self, section_id, value)
+    end
+
     for i, n in ipairs(s.children) do
         if n ~= ignore then
             n:depends("ignore", "")
+            n.write  = write_opt
+            n.remove = remove_opt
         end
     end