modules/freifunk: remove sorting function from widgets include in index view
authorManuel Munz <freifunk@somakoma.de>
Wed, 19 Sep 2012 09:44:20 +0000 (09:44 +0000)
committerManuel Munz <freifunk@somakoma.de>
Wed, 19 Sep 2012 09:44:20 +0000 (09:44 +0000)
modules/freifunk/luasrc/view/freifunk/index.htm

index d1862bd..0fcec45 100644 (file)
@@ -78,18 +78,13 @@ local dir = "/usr/lib/lua/luci/view/freifunk/widgets"
 uci:foreach("freifunk-widgets", "widget",
                        function(s)
                                if s.enabled == "1" then
 uci:foreach("freifunk-widgets", "widget",
                        function(s)
                                if s.enabled == "1" then
-                                       local name = s[".name"] 
-                                       widgets[name] = s
+                                       table.insert(widgets, s)
                                end
                        end)
 
                                end
                        end)
 
-local function cmp(a, b)
-       return (widgets[a].order or 100) > (widgets[b].order or 100)
-end
-
-for k, v in luci.util.spairs(widgets, function(a,b) return (tonumber(widgets[a].order) < tonumber(widgets[b].order)) end) do
+for k, v in ipairs(widgets) do
        if v['template'] and fs.access(dir .. "/" .. v['template'] .. "/main.htm") then
        if v['template'] and fs.access(dir .. "/" .. v['template'] .. "/main.htm") then
-               tpl.render("freifunk/widgets/" .. v['template'] .. "/main", { name = k, data = v })
+               tpl.render("freifunk/widgets/" .. v['template'] .. "/main", { data = v })
        end
 end
 
        end
 end