From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 30 Jul 2011 19:43:15 +0000 (+0000)
Subject: luci-0.10: merge r7336
X-Git-Tag: 0.10.0~90
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6c92060639e584da792cd078548e360c63fa21fc;p=oweals%2Fluci.git

luci-0.10: merge r7336
---

diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
index ba6bdcd9c..009054a86 100644
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
+++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/devinfo_common.lua
@@ -23,6 +23,10 @@ local translate = luci.i18n.translate
 local DummyValue = luci.cbi.DummyValue
 local SimpleSection = luci.cbi.SimpleSection
 
+function index()
+	return -- no-op
+end
+
 function run_processes(outnets, cmdfunc)
    i = next(outnets, nil)
    while (i) do
@@ -190,4 +194,4 @@ function config_devinfo_scan(map, scannet)
    
    o = scannet:option(luci.cbi.Value, "sleepreq", translate("Sleep Between Requests"), translate("Milliseconds to sleep between requests (default 100)"))
    o.optional = true
-end
\ No newline at end of file
+end
diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
index 0cd981e05..95859aeaf 100644
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
+++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/netdiscover_common.lua
@@ -23,6 +23,9 @@ local translate = luci.i18n.translate
 local DummyValue = luci.cbi.DummyValue
 local SimpleSection = luci.cbi.SimpleSection
 
+function index()
+	return -- no-op
+end
 	 
 function get_params()
 
@@ -96,4 +99,4 @@ function action_links(netdiscovermap, mini)
    else
       b.titleref = luci.dispatcher.build_url("admin", "status", "netdiscover_devinfo")
    end
-end
\ No newline at end of file
+end
diff --git a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
index 3d02d689a..13ac91f93 100644
--- a/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
+++ b/applications/luci-diag-devinfo/luasrc/controller/luci_diag/smap_common.lua
@@ -23,6 +23,10 @@ local translate = luci.i18n.translate
 local DummyValue = luci.cbi.DummyValue
 local SimpleSection = luci.cbi.SimpleSection
 
+function index()
+	return -- no-op
+end
+
 function get_params()
 
    local smapnets_uci = luci.model.uci.cursor()