Changeset 7294

Timestamp:

07/17/11 07:47:26 (23 months ago)

Author:

jow

Message:

luci-0.10: merge r7293

Files:

• luci/branches/luci-0.10/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua (modified) (5 diffs)

luci/branches/luci-0.10/modules/admin-full/luasrc/model/cbi/admin_network/vlan.lua

@@ -19 +19 @@
     function(x)
         local switch_name = x.name or x['.name']
-        local has_enable  = "enable"
-        local has_reset   = nil
         local has_vlan    = nil
         local has_learn   = nil 
@@ -56 +54 @@
                         line:match("ports: (%d+) %(cpu @ (%d+)%), vlans: (%d+)")
 
-                    num_ports  = tonumber(num_ports or  6)
-                    num_vlans  = tonumber(num_vlans or 16)
-                    cpu_port   = tonumber(cpu_port  or  5)
+                    num_ports  = tonumber(num_ports) or  6
+                    num_vlans  = tonumber(num_vlans) or 16
+                    cpu_port   = tonumber(cpu_port)  or  5
                     min_vid    = 1
-                    has_enable = nil
 
                 elseif line:match(": pvid") or line:match(": tag") or line:match(": vid") then
@@ -71 +68 @@
                 elseif line:match(": enable_learning") then
                     has_learn = "enable_learning"
-
-                elseif line:match(": reset") then
-                    has_reset = "reset"
 
                 elseif line:match(": enable_vlan4k") then
@@ -118 +112 @@
         s.addremove = false
 
-        if has_enable then
-            x = s:option(Flag, has_enable, translate("Enable this switch"))
-            x.default = x.enabled
-        end
-
         if has_vlan then
-            x = s:option(Flag, has_vlan, translate("Enable VLAN functionality"))
-            x.default = x.enabled
+            s:option(Flag, has_vlan, translate("Enable VLAN functionality"))
         end
 
@@ -141 +129 @@
             x.enabled = "3"
             x.rmempty = true
-        end
-
-        if has_reset then
-            x = s:option(Flag, has_reset, translate("Reset switch during setup"))
-            x.default = x.enabled
         end