From 30fbac75ac7f48cf50dcf9c628c020b59d26c764 Mon Sep 17 00:00:00 2001 From: Sven Roederer <freifunk@it-solutions.geroedel.de> Date: Sun, 24 Apr 2016 22:38:26 +0200 Subject: [PATCH] luci-mod-freifunk: fix lookup of community-name restore the lookup of the freifunk community-name stored in uci "freifunk.community.name". In https://github.com/openwrt/luci/commit/9780ee382e72f8a5fb69e337a3fcc51fc0914883 the value changed to the complete path of the community-profile, e.g. "/etc/config/profile_berlin". This causes lookup problems on other pages, like "mod-freifunk -> overview -> index" (view/freifunk/index.htm line37, line 54). And as the option suggests it's the community-name not the community-profile path. This is a backport of https://github.com/openwrt/luci/commit/61c7157a66b4bbce7d110cc0de8164bd2bd57798 Signed-off-by: Sven Roederer <devel-sven@geroedel.de> --- modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua index 0d3d971c3..b08366de6 100644 --- a/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua +++ b/modules/luci-mod-freifunk/luasrc/model/cbi/freifunk/basics.lua @@ -16,7 +16,7 @@ community.rmempty = false local profile for profile in fs.glob(profiles) do local name = uci:get_first(profile, "community", "name") or "?" - community:value(profile, name) + community:value(string.gsub(profile, "/etc/config/profile_", ""), name) end -- 2.25.1